Merge branch 'core/percpu' into stackprotector

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / stackprotector.h

diff --git a/include/asm-x86/stackprotector.h b/arch/x86/include/asm/stackprotector.h
similarity index 98%
rename from include/asm-x86/stackprotector.h
rename to arch/x86/include/asm/stackprotector.h
index 3baf7ad89be11a5df7e65a50e522293b22faa2d3..c7f0d10bae7b5c8c6012d69836ee0f156d8149d2 100644 (file)
--- a/include/asm-x86/stackprotector.h
+++ b/arch/x86/include/asm/stackprotector.h
@@ -2,6 +2,7 @@
 #define _ASM_STACKPROTECTOR_H 1
 
 #include <asm/tsc.h>
+#include <asm/pda.h>
 
 /*
  * Initialize the stackprotector canary value.