Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 8 insertions, 8 deletions

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 82c43624c067..5a9aae4adb44 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -16,14 +16,14 @@
 #define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
 #define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
 
-#define GRE_CSUM        __constant_htons(0x8000)
-#define GRE_ROUTING     __constant_htons(0x4000)
-#define GRE_KEY         __constant_htons(0x2000)
-#define GRE_SEQ         __constant_htons(0x1000)
-#define GRE_STRICT      __constant_htons(0x0800)
-#define GRE_REC         __constant_htons(0x0700)
-#define GRE_FLAGS       __constant_htons(0x00F8)
-#define GRE_VERSION     __constant_htons(0x0007)
+#define GRE_CSUM        __cpu_to_be16(0x8000)
+#define GRE_ROUTING     __cpu_to_be16(0x4000)
+#define GRE_KEY         __cpu_to_be16(0x2000)
+#define GRE_SEQ         __cpu_to_be16(0x1000)
+#define GRE_STRICT      __cpu_to_be16(0x0800)
+#define GRE_REC         __cpu_to_be16(0x0700)
+#define GRE_FLAGS       __cpu_to_be16(0x00F8)
+#define GRE_VERSION     __cpu_to_be16(0x0007)
 
 struct ip_tunnel_parm
 {