From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 28 Jan 2005 05:14:00 +0000 (+0000)
Subject: cleanup to reduce diff w/ 2.6.9-1.11_FC2
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~278
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8c8ad62aef0a333ed8688a8505ede6549032bbee;p=linux-2.6.git

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 edaec9b18..7f979f74b 100644
--- 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 ac9b82da2..d787e4eee 100644
--- 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 4fb1bc4d3..7433fb841 100644
--- 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 c8eaad2d5..8dc26e97c 100644
--- 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