Merge branch 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current (fc25465f) · Commits · 戴 / test

arch/i386/kernel/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@ obj-$(CONFIG_VM86) += vm86.o
	obj-$(CONFIG_EARLY_PRINTK) += early_printk.o		obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
	obj-$(CONFIG_HPET_TIMER) += hpet.o		obj-$(CONFIG_HPET_TIMER) += hpet.o
	obj-$(CONFIG_K8_NB) += k8.o		obj-$(CONFIG_K8_NB) += k8.o
			obj-$(CONFIG_AUDIT) += audit.o

	EXTRA_AFLAGS := -traditional		EXTRA_AFLAGS := -traditional

0 → 100644

+23 −0

Original line number	Original line	Diff line number	Diff line
			#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 chattr_class[] = {
			#include <asm-generic/audit_change_attr.h>
			~0U
			};

			static int __init audit_classes_init(void)
			{
			audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
			audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
			return 0;
			}

			__initcall(audit_classes_init);

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,7 @@

	obj-y := ia32_entry.o sys_ia32.o ia32_signal.o \		obj-y := ia32_entry.o sys_ia32.o ia32_signal.o \
	ia32_support.o ia32_traps.o binfmt_elf32.o ia32_ldt.o		ia32_support.o ia32_traps.o binfmt_elf32.o ia32_ldt.o
			obj-$(CONFIG_AUDIT) += audit.o

	# Don't let GCC uses f16-f31 so that save_ia32_fpstate_live() and		# Don't let GCC uses f16-f31 so that save_ia32_fpstate_live() and
	# restore_ia32_fpstate_live() can be sure the live register contain user-level state.		# restore_ia32_fpstate_live() can be sure the live register contain user-level state.

0 → 100644

+11 −0

Original line number	Original line	Diff line number	Diff line
			#include <asm-i386/unistd.h>

			unsigned ia32_dir_class[] = {
			#include <asm-generic/audit_dir_write.h>
			~0U
			};

			unsigned ia32_chattr_class[] = {
			#include <asm-generic/audit_change_attr.h>
			~0U
			};

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/
	obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o		obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o
	obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o		obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o
	obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o		obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o
			obj-$(CONFIG_AUDIT) += audit.o
	mca_recovery-y += mca_drv.o mca_drv_asm.o		mca_recovery-y += mca_drv.o mca_drv_asm.o

	# The gate DSO image is built using a special linker script.		# The gate DSO image is built using a special linker script.