cleanup to reduce diff w/ 2.6.9-1.11_FC2

diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h
index edaec9b..7f979f7 100644 (file)
--- a/include/asm-i386/processor.h
+++ b/include/asm-i386/processor.h
@@ -304,8 +304,6 @@ extern unsigned long arch_align_stack(unsigned long sp);
 
 #define HAVE_ARCH_PICK_MMAP_LAYOUT
 
-#define HAVE_ARCH_PICK_MMAP_LAYOUT
-
 /*
  * Size of io_bitmap.
  */

diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h
index ac9b82d..d787e4e 100644 (file)
--- a/include/asm-i386/thread_info.h
+++ b/include/asm-i386/thread_info.h
@@ -64,7 +64,7 @@ struct thread_info {
  */
 #ifndef __ASSEMBLY__
 
-#define INIT_THREAD_INFO(tsk)                  \
+#define INIT_THREAD_INFO(tsk)                  \
 {                                              \
        .task           = &tsk,                 \
        .exec_domain    = &default_exec_domain, \

diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 4fb1bc4..7433fb8 100644 (file)
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -297,8 +297,6 @@
 #define __NR_ioprio_set                284
 #define __NR_ioprio_get                285
 #define NR_syscalls 286
-#else
-#warning MEF not includig sys_ioprio_{set,get} syscalls
 #endif 
 
 #ifndef __KERNEL_SYSCALLS_NO_ERRNO__

diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index c8eaad2..8dc26e9 100644 (file)
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -64,6 +64,7 @@ extern void machine_restart(char *cmd);
 extern void machine_halt(void);
 extern void machine_power_off(void);
 extern void (*machine_reset)(void);
+
 extern void machine_shutdown(void);
 
 #endif