I've just been reviewing these patches and have spotted a couple of
errors that look like they were caused by fuzz during the patch process.

A patch that corrects the errors is attached.

Cheers
Peter
-- 
Peter Williams                                   [EMAIL PROTECTED]

"Learning, n. The kind of ignorance distinguishing the studious."
 -- Ambrose Bierce

diff -r e02fd64426b9 arch/i386/boot/compressed/Makefile
--- a/arch/i386/boot/compressed/Makefile        Thu Jul 26 10:33:58 2007 +1000
+++ b/arch/i386/boot/compressed/Makefile        Thu Jul 26 11:17:35 2007 +1000
@@ -9,10 +9,9 @@ EXTRA_AFLAGS   := -traditional
 EXTRA_AFLAGS   := -traditional
 
 LDFLAGS_vmlinux := -T
-CFLAGS := -m32 -D__KERNEL__ -Iinclude -O2  -fno-strict-aliasing
 hostprogs-y    := relocs
 
-CFLAGS  := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -O2 \
+CFLAGS  := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -Iinclude -O2 \
           -fno-strict-aliasing -fPIC \
           $(call cc-option,-ffreestanding) \
           $(call cc-option,-fno-stack-protector)
diff -r e02fd64426b9 arch/i386/kernel/smp.c
--- a/arch/i386/kernel/smp.c    Thu Jul 26 10:33:58 2007 +1000
+++ b/arch/i386/kernel/smp.c    Thu Jul 26 11:17:35 2007 +1000
@@ -651,7 +651,6 @@ fastcall notrace void smp_reschedule_int
 fastcall notrace void smp_reschedule_interrupt(struct pt_regs *regs)
 {
        trace_special(regs->eip, 0, 0);
-       trace_special(regs->eip, 0, 0);
        ack_APIC_irq();
        set_tsk_need_resched(current);
 }
diff -r e02fd64426b9 include/asm-mips/mipsregs.h
--- a/include/asm-mips/mipsregs.h       Thu Jul 26 10:33:58 2007 +1000
+++ b/include/asm-mips/mipsregs.h       Thu Jul 26 11:17:35 2007 +1000
@@ -710,7 +710,7 @@ do {                                                        
                \
        unsigned long long __val;                                       \
        unsigned long __flags;                                          \
                                                                        \
-       local_irq_save(flags);                                  \
+       local_irq_save(__flags);                                        \
        if (sel == 0)                                                   \
                __asm__ __volatile__(                                   \
                        ".set\tmips64\n\t"                              \

Reply via email to