Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[sfrench/cifs-2.6.git] / arch / s390 / include / asm / elf.h

diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index fabebe1e45d93306a850cf9257d70d9780d4bb02..563ab9f44874f97cebf99fbe9f961e3fad2861fb 100644 (file)
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -104,6 +104,9 @@
 #define HWCAP_S390_TE          1024
 #define HWCAP_S390_VXRS                2048
 
+/* Internal bits, not exposed via elf */
+#define HWCAP_INT_SIE          1UL
+
 /*
  * These are used to set parameters in the core dumps.
  */
@@ -170,6 +173,10 @@ extern unsigned int vdso_enabled;
 extern unsigned long elf_hwcap;
 #define ELF_HWCAP (elf_hwcap)
 
+/* Internal hardware capabilities, not exposed via elf */
+
+extern unsigned long int_hwcap;
+
 /* This yields a string that ld.so will use to load implementation
    specific libraries for optimization.  This is more specific in
    intent than poking at uname or /proc/cpuinfo.