diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 11:10:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 11:10:42 +0200 |
| commit | ea1c9de45ecb162841c9b4e0fa303a245d59b1c8 (patch) | |
| tree | 72ef1624d8a4c581ad94a84f38f941682562030b /arch/x86/mm/mmio-mod.c | |
| parent | 4e1d112cac08049e764fe3c4f6d3ec92529f9f68 (diff) | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| download | kernel_samsung_aries-ea1c9de45ecb162841c9b4e0fa303a245d59b1c8.zip kernel_samsung_aries-ea1c9de45ecb162841c9b4e0fa303a245d59b1c8.tar.gz kernel_samsung_aries-ea1c9de45ecb162841c9b4e0fa303a245d59b1c8.tar.bz2 | |
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'arch/x86/mm/mmio-mod.c')
| -rw-r--r-- | arch/x86/mm/mmio-mod.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c index e7397e1..635b50e 100644 --- a/arch/x86/mm/mmio-mod.c +++ b/arch/x86/mm/mmio-mod.c @@ -430,7 +430,9 @@ static void enter_uniprocessor(void) "may miss events.\n"); } -static void leave_uniprocessor(void) +/* __ref because leave_uniprocessor calls cpu_up which is __cpuinit, + but this whole function is ifdefed CONFIG_HOTPLUG_CPU */ +static void __ref leave_uniprocessor(void) { int cpu; int err; |