diff options
author | Tony Luck <tony.luck@intel.com> | 2010-02-26 12:04:13 -0800 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2010-02-26 12:04:13 -0800 |
commit | 8d6339b8a532ec4eeb31db321cf1e6068965deda (patch) | |
tree | 0fa1d7aa14d3dcc6f6ac5236ba14649fd9a0d5e6 /arch/ia64/kernel/audit.c | |
parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
parent | 32974ad4907cdde6c9de612cd1b2ee0568fb9409 (diff) |
Pull rmia32 into release branch
Diffstat (limited to 'arch/ia64/kernel/audit.c')
-rw-r--r-- | arch/ia64/kernel/audit.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c index f3802ae89b1..96a9d18ff4c 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); |