diff options
| -rw-r--r-- | arch/mips64/kernel/smp.c | 1 | ||||
| -rw-r--r-- | include/asm-mips64/system.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips64/kernel/smp.c b/arch/mips64/kernel/smp.c index e1aedbb10..c36337564 100644 --- a/arch/mips64/kernel/smp.c +++ b/arch/mips64/kernel/smp.c @@ -71,7 +71,6 @@ void __init smp_boot_cpus(void) extern void allowboot(void); init_new_context(current, &init_mm); - global_irq_holder = 0; current->processor = 0; init_idle(); smp_tune_scheduling(); diff --git a/include/asm-mips64/system.h b/include/asm-mips64/system.h index 3592b3821..47e90aec4 100644 --- a/include/asm-mips64/system.h +++ b/include/asm-mips64/system.h @@ -117,7 +117,7 @@ extern void __global_restore_flags(unsigned long); #define sti() __global_sti() #define save_flags(x) ((x)=__global_save_flags()) #define restore_flags(x) __global_restore_flags(x) -#define save_and_cli(x) do { save_flags(flags); cli(); } while(0) +#define save_and_cli(x) do { save_flags(x); cli(); } while(0) #else |