diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:12:55 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:12:55 -0500 |
| commit | 6a385db5ce7f1fd2c68ec511e44587b67dab8fca (patch) | |
| tree | 9324c8ae6f7be54b9fdbd6b60f759292aa727b1f /arch/x86/include/asm/setup.h | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | 4369f1fb7cd4cf777312f43e1cb9aa5504fc4125 (diff) | |
Merge branch 'core/percpu' into x86/core
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'arch/x86/include/asm/setup.h')
| -rw-r--r-- | arch/x86/include/asm/setup.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index ebe858cdc8a3..536949749bc2 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h | |||
| @@ -100,7 +100,6 @@ extern unsigned long init_pg_tables_start; | |||
| 100 | extern unsigned long init_pg_tables_end; | 100 | extern unsigned long init_pg_tables_end; |
| 101 | 101 | ||
| 102 | #else | 102 | #else |
| 103 | void __init x86_64_init_pda(void); | ||
| 104 | void __init x86_64_start_kernel(char *real_mode); | 103 | void __init x86_64_start_kernel(char *real_mode); |
| 105 | void __init x86_64_start_reservations(char *real_mode_data); | 104 | void __init x86_64_start_reservations(char *real_mode_data); |
| 106 | 105 | ||