Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] wrong attribute of HUB chip written in uv_setup()
  [IA64] remove trailing space in messages
  [IA64] use asm-generic/scatterlist.h
  [IA64] build arch/ia64/kernel/acpi-ext.o when CONFIG_ACPI
  [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI
  [IA64] Remove COMPAT_IA32 support

1 files changed, 0 insertions, 21 deletions

diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c
index f3802ae89b10..96a9d18ff4c4 100644
--- a/arch/ia64/kernel/audit.c
+++ b/arch/ia64/kernel/audit.c
@@ -30,20 +30,11 @@ static unsigned signal_class[] = {
 
 int audit_classify_arch(int arch)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        if (arch == AUDIT_ARCH_I386)
-                return 1;
-#endif
         return 0;
 }
 
 int audit_classify_syscall(int abi, unsigned syscall)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        extern int ia32_classify_syscall(unsigned);
-        if (abi == AUDIT_ARCH_I386)
-                return ia32_classify_syscall(syscall);
-#endif
         switch(syscall) {
         case __NR_open:
                 return 2;
@@ -58,18 +49,6 @@ int audit_classify_syscall(int abi, unsigned syscall)
 
 static int __init audit_classes_init(void)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        extern __u32 ia32_dir_class[];
-        extern __u32 ia32_write_class[];
-        extern __u32 ia32_read_class[];
-        extern __u32 ia32_chattr_class[];
-        extern __u32 ia32_signal_class[];
-        audit_register_class(AUDIT_CLASS_WRITE_32, ia32_write_class);
-        audit_register_class(AUDIT_CLASS_READ_32, ia32_read_class);
-        audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);
-        audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);
-        audit_register_class(AUDIT_CLASS_SIGNAL_32, ia32_signal_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);