From 6e4c156c5be967936ef71edda679f6cefeec5570 Mon Sep 17 00:00:00 2001 From: Sven Luther Date: Fri, 30 Dec 2005 10:45:22 +0000 Subject: [PATCH] Removed applied powerpc64 audit sysctl patch. svn path=/dists/trunk/linux-2.6/; revision=5150 --- .../powerpc64-audit_sysctl-build.patch | 32 ------------------- .../series/2.6.14+2.6.15-rc7-0experimental.1 | 1 - 2 files changed, 33 deletions(-) delete mode 100644 debian/patches-debian/powerpc64-audit_sysctl-build.patch diff --git a/debian/patches-debian/powerpc64-audit_sysctl-build.patch b/debian/patches-debian/powerpc64-audit_sysctl-build.patch deleted file mode 100644 index d8727cddf..000000000 --- a/debian/patches-debian/powerpc64-audit_sysctl-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -Date: Mon, 31 Oct 2005 22:10:59 +0900 -From: Horms -To: linuxppc-dev@ozlabs.org -Cc: Andrew Morton , david@woodhou.se -Subject: audit_sysctl_exit can only be used with CONF_AUDIT_SYSCTL - -This section of code calls .audit_syscal_exit, -but is inside CONFIG_AUDIT, so it will fail to build -if CONFIG_AUDITSYSCALL is not defined. - -After discussion with David Woodhouse, change the -ifdef to CONFIG_AUDITSYSCALL - - -Signed-off-by: Horms - --- -Backported to 2.6.14 by Horms - -diff --git a/arch/ppc64/kernel/entry.S b/arch/ppc64/kernel/entry.S -index 984a106..2d22bf0 100644 ---- a/arch/ppc64/kernel/entry.S -+++ b/arch/ppc64/kernel/entry.S -@@ -279,7 +279,7 @@ _GLOBAL(ppc32_rt_sigsuspend) - bne syscall_exit - /* If sigsuspend() returns zero, we are going into a signal handler. We - may need to call audit_syscall_exit() to mark the exit from sigsuspend() */ --#ifdef CONFIG_AUDIT -+#ifdef CONFIG_AUDITSYSCALL - ld r3,PACACURRENT(r13) - ld r4,AUDITCONTEXT(r3) - cmpdi 0,r4,0 diff --git a/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1 b/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1 index 21f0f93a0..c36a78a73 100644 --- a/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1 +++ b/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1 @@ -13,7 +13,6 @@ + powerpc-apus.patch #+ s390-uaccess-const.patch + powerpc-build-links.patch -#+ powerpc64-audit_sysctl-build.patch + m68k-bvme.patch + m68k-mvme147.patch + m68k-mvme16x.patch