Merge branch 'linux-2.6'

5 files changed, 132 insertions, 25 deletions

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index d2ab2943d230..8b3f4faf5768 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -70,6 +70,8 @@ obj-$(CONFIG_PCI)		+= $(pci64-y) $(pci32-y)
 kexec-$(CONFIG_PPC64)           := machine_kexec_64.o
 kexec-$(CONFIG_PPC32)           := machine_kexec_32.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o crash.o $(kexec-y)
+obj-$(CONFIG_AUDIT)             += audit.o
+obj64-$(CONFIG_AUDIT)           += compat_audit.o
 
 ifeq ($(CONFIG_PPC_ISERIES),y)
 $(obj)/head_64.o: $(obj)/lparmap.s
diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c
new file mode 100644
index 000000000000..7fe5e6300e9a
--- /dev/null
+++ b/arch/powerpc/kernel/audit.c
@@ -0,0 +1,66 @@
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/audit.h>
+#include <asm/unistd.h>
+
+static unsigned dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+static unsigned read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+static unsigned write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
+static unsigned chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
+
+int audit_classify_syscall(int abi, unsigned syscall)
+{
+#ifdef CONFIG_PPC64
+        extern int ppc32_classify_syscall(unsigned);
+        if (abi == AUDIT_ARCH_PPC)
+                return ppc32_classify_syscall(syscall);
+#endif
+        switch(syscall) {
+        case __NR_open:
+                return 2;
+        case __NR_openat:
+                return 3;
+        case __NR_socketcall:
+                return 4;
+        case __NR_execve:
+                return 5;
+        default:
+                return 0;
+        }
+}
+
+static int __init audit_classes_init(void)
+{
+#ifdef CONFIG_PPC64
+        extern __u32 ppc32_dir_class[];
+        extern __u32 ppc32_write_class[];
+        extern __u32 ppc32_read_class[];
+        extern __u32 ppc32_chattr_class[];
+        audit_register_class(AUDIT_CLASS_WRITE_32, ppc32_write_class);
+        audit_register_class(AUDIT_CLASS_READ_32, ppc32_read_class);
+        audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ppc32_dir_class);
+        audit_register_class(AUDIT_CLASS_CHATTR_32, ppc32_chattr_class);
+#endif
+        audit_register_class(AUDIT_CLASS_WRITE, write_class);
+        audit_register_class(AUDIT_CLASS_READ, read_class);
+        audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
+        audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+        return 0;
+}
+
+__initcall(audit_classes_init);
diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c
new file mode 100644
index 000000000000..640d4bb29321
--- /dev/null
+++ b/arch/powerpc/kernel/compat_audit.c
@@ -0,0 +1,38 @@
+#undef __powerpc64__
+#include <asm/unistd.h>
+
+unsigned ppc32_dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+unsigned ppc32_chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
+
+unsigned ppc32_write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
+unsigned ppc32_read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+int ppc32_classify_syscall(unsigned syscall)
+{
+        switch(syscall) {
+        case __NR_open:
+                return 2;
+        case __NR_openat:
+                return 3;
+        case __NR_socketcall:
+                return 4;
+        case __NR_execve:
+                return 5;
+        default:
+                return 1;
+        }
+}
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index f04c18e08b8b..1af41f7616dc 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -295,7 +295,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
                 struct irq_desc *desc = irq_desc + irq;
 
                 if (desc->status & IRQ_INPROGRESS)
-                        desc->chip->end(irq);
+                        desc->chip->eoi(irq);
 
                 if (!(desc->status & IRQ_DISABLED))
                         desc->chip->disable(irq);
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index fc23040d5a26..f770805f1215 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -17,15 +17,6 @@
 
         .text
 
-#ifdef CONFIG_PPC64
-#define IN_SYNC         twi     0,r5,0; isync
-#define EIEIO_32
-#define SYNC_64         sync
-#else /* CONFIG_PPC32 */
-#define IN_SYNC
-#define EIEIO_32        eieio
-#define SYNC_64
-#endif
 /*
  * Returns (address we are running at) - (address we were linked at)
  * for use before the text and data are mapped to KERNELBASE.
@@ -70,6 +61,7 @@ _GLOBAL(add_reloc_offset)
  * The *_ns versions don't do byte-swapping.
  */
 _GLOBAL(_insb)
+        sync
         cmpwi   0,r5,0
         mtctr   r5
         subi    r4,r4,1
@@ -78,7 +70,8 @@ _GLOBAL(_insb)
         eieio
         stbu    r5,1(r4)
         bdnz    00b
-        IN_SYNC
+        twi     0,r5,0
+        isync
         blr
 
 _GLOBAL(_outsb)
@@ -86,14 +79,15 @@ _GLOBAL(_outsb)
         mtctr   r5
         subi    r4,r4,1
         blelr-
+        sync
 00:     lbzu    r5,1(r4)
         stb     r5,0(r3)
-        EIEIO_32
         bdnz    00b
-        SYNC_64
+        sync
         blr
 
 _GLOBAL(_insw)
+        sync
         cmpwi   0,r5,0
         mtctr   r5
         subi    r4,r4,2
@@ -102,7 +96,8 @@ _GLOBAL(_insw)
         eieio
         sthu    r5,2(r4)
         bdnz    00b
-        IN_SYNC
+        twi     0,r5,0
+        isync
         blr
 
 _GLOBAL(_outsw)
@@ -110,14 +105,15 @@ _GLOBAL(_outsw)
         mtctr   r5
         subi    r4,r4,2
         blelr-
+        sync
 00:     lhzu    r5,2(r4)
-        EIEIO_32
         sthbrx  r5,0,r3
         bdnz    00b
-        SYNC_64
+        sync
         blr
 
 _GLOBAL(_insl)
+        sync
         cmpwi   0,r5,0
         mtctr   r5
         subi    r4,r4,4
@@ -126,7 +122,8 @@ _GLOBAL(_insl)
         eieio
         stwu    r5,4(r4)
         bdnz    00b
-        IN_SYNC
+        twi     0,r5,0
+        isync
         blr
 
 _GLOBAL(_outsl)
@@ -134,17 +131,18 @@ _GLOBAL(_outsl)
         mtctr   r5
         subi    r4,r4,4
         blelr-
+        sync
 00:     lwzu    r5,4(r4)
         stwbrx  r5,0,r3
-        EIEIO_32
         bdnz    00b
-        SYNC_64
+        sync
         blr
 
 #ifdef CONFIG_PPC32
 _GLOBAL(__ide_mm_insw)
 #endif
 _GLOBAL(_insw_ns)
+        sync
         cmpwi   0,r5,0
         mtctr   r5
         subi    r4,r4,2
@@ -153,7 +151,8 @@ _GLOBAL(_insw_ns)
         eieio
         sthu    r5,2(r4)
         bdnz    00b
-        IN_SYNC
+        twi     0,r5,0
+        isync
         blr
 
 #ifdef CONFIG_PPC32
@@ -164,17 +163,18 @@ _GLOBAL(_outsw_ns)
         mtctr   r5
         subi    r4,r4,2
         blelr-
+        sync
 00:     lhzu    r5,2(r4)
         sth     r5,0(r3)
-        EIEIO_32
         bdnz    00b
-        SYNC_64
+        sync
         blr
 
 #ifdef CONFIG_PPC32
 _GLOBAL(__ide_mm_insl)
 #endif
 _GLOBAL(_insl_ns)
+        sync
         cmpwi   0,r5,0
         mtctr   r5
         subi    r4,r4,4
@@ -183,7 +183,8 @@ _GLOBAL(_insl_ns)
         eieio
         stwu    r5,4(r4)
         bdnz    00b
-        IN_SYNC
+        twi     0,r5,0
+        isync
         blr
 
 #ifdef CONFIG_PPC32
@@ -194,10 +195,10 @@ _GLOBAL(_outsl_ns)
         mtctr   r5
         subi    r4,r4,4
         blelr-
+        sync
 00:     lwzu    r5,4(r4)
         stw     r5,0(r3)
-        EIEIO_32
         bdnz    00b
-        SYNC_64
+        sync
         blr