From 0abba0422b8e224367a351f0ea83d12782ad2507 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sat, 9 Aug 2014 17:52:47 +0000
Subject: [PATCH] [arm*,ia64,ppc64el,s390*,sh4] Disable SYSFS_SYSCALL, only
 needed for SVR4 compatibility

svn path=/dists/trunk/linux/; revision=21716
---
 debian/changelog                                   | 2 ++
 debian/config/alpha/config                         | 1 +
 debian/config/config                               | 1 +
 debian/config/hppa/config                          | 5 +++++
 debian/config/kernelarch-mips/config               | 5 +++++
 debian/config/kernelarch-powerpc/config-arch-64-be | 5 +++++
 debian/config/kernelarch-sparc/config              | 5 +++++
 debian/config/kernelarch-x86/config                | 1 +
 debian/config/m68k/config                          | 1 +
 debian/config/powerpc/config.powerpc               | 5 +++++
 10 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 679376921..34f4e1e29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ linux (3.16-1~exp1) UNRELEASED; urgency=medium
     (Closes: #756998)
   * [armhf] touchscreen: Enable TOUCHSCREEN_SUN4I as module (Closes: #757086)
   * [!alpha,m68k,x86] Disable USELIB, only needed by libc5
+  * [arm*,ia64,ppc64el,s390*,sh4] Disable SYSFS_SYSCALL, only needed for
+    SVR4 compatibility
   * [armel] Disable BINFMT_AOUT
   * [armel] Change configuration to reduce kernel image size
     - [/kirkwood] Change IPV6 to module
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index d76f9a536..6c81199e5 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -950,6 +950,7 @@ CONFIG_BINFMT_EM86=m
 CONFIG_USELIB=y
 #. TODO
 # CONFIG_AUDIT is not set
+CONFIG_SYSFS_SYSCALL=y
 
 ##
 ## file: lib/Kconfig
diff --git a/debian/config/config b/debian/config/config
index 1d8ebdfe1..396003da5 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4745,6 +4745,7 @@ CONFIG_BLK_DEV_INITRD=y
 #. Unfortunately some useful options are conditional on EXPERT
 CONFIG_EXPERT=y
 CONFIG_UID16=y
+# CONFIG_SYSFS_SYSCALL is not set
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 7987acabb..cc5ccf2ab 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -566,6 +566,11 @@ CONFIG_FB_STI=y
 ##
 CONFIG_ROOT_NFS=y
 
+##
+## file: init/Kconfig
+##
+CONFIG_SYSFS_SYSCALL=y
+
 ##
 ## file: lib/Kconfig.debug
 ##
diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config
index 2d5a0af93..8a05f1c22 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -31,3 +31,8 @@ CONFIG_BLK_DEV_SD=y
 ##
 CONFIG_EXT4_FS=y
 
+##
+## file: init/Kconfig
+##
+CONFIG_SYSFS_SYSCALL=y
+
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be
index fc9a60a9c..b662db0d5 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-be
+++ b/debian/config/kernelarch-powerpc/config-arch-64-be
@@ -88,6 +88,11 @@ CONFIG_RTC_DRV_PS3=m
 CONFIG_FB_PS3=y
 CONFIG_FB_PS3_DEFAULT_SIZE_M=9
 
+##
+## file: init/Kconfig
+##
+CONFIG_SYSFS_SYSCALL=y
+
 ##
 ## file: sound/ppc/Kconfig
 ##
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index 207e2e832..0876792a0 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -534,6 +534,11 @@ CONFIG_FB_ATY_GX=y
 ##
 # CONFIG_W1 is not set
 
+##
+## file: init/Kconfig
+##
+CONFIG_SYSFS_SYSCALL=y
+
 ##
 ## file: lib/xz/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 0638a71a9..76d4d777a 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1711,6 +1711,7 @@ CONFIG_USELIB=y
 ## choice: Cputime accounting
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 ## end choice
+CONFIG_SYSFS_SYSCALL=y
 
 ##
 ## file: kernel/irq/Kconfig
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 693c20f32..4288014dd 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -731,6 +731,7 @@ CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_CGROUPS is not set
 # CONFIG_SCHED_AUTOGROUP is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSFS_SYSCALL=y
 CONFIG_COMPAT_BRK=y
 # CONFIG_MODULE_SIG is not set
 
diff --git a/debian/config/powerpc/config.powerpc b/debian/config/powerpc/config.powerpc
index 61b139fce..5d48b574d 100644
--- a/debian/config/powerpc/config.powerpc
+++ b/debian/config/powerpc/config.powerpc
@@ -90,6 +90,11 @@ CONFIG_FB_PLATINUM=y
 CONFIG_FB_VALKYRIE=y
 CONFIG_FB_IMSTT=y
 
+##
+## file: init/Kconfig
+##
+CONFIG_SYSFS_SYSCALL=y
+
 ##
 ## file: mm/Kconfig
 ##