Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd314d97 authored Sep 12, 2006 by Linus Torvalds

Merge branch 'audit.b29' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

* 'audit.b29' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] sparc64 audit syscall classes hookup
  [PATCH] syscall class hookup for all normal targets

parents 48c068e0 f6bc0c1c

arch/i386/kernel/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,6 @@ 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

arch/ia64/Kconfig

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -75,6 +75,10 @@ config DMA_IS_NORMAL
	depends on IA64_SGI_SN2		depends on IA64_SGI_SN2
	default y		default y

			config AUDIT_ARCH
			bool
			default y

	choice		choice
	prompt "System type"		prompt "System type"
	default IA64_GENERIC		default IA64_GENERIC

arch/powerpc/Kconfig

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -95,6 +95,10 @@ config GENERIC_TBSYNC
	default y if PPC32 && SMP		default y if PPC32 && SMP
	default n		default n

			config AUDIT_ARCH
			bool
			default y

	config DEFAULT_UIMAGE		config DEFAULT_UIMAGE
	bool		bool
	help		help

arch/s390/Kconfig

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -118,6 +118,10 @@ config SYSVIPC_COMPAT
	depends on COMPAT && SYSVIPC		depends on COMPAT && SYSVIPC
	default y		default y

			config AUDIT_ARCH
			bool
			default y

	comment "Code generation options"		comment "Code generation options"

	choice		choice

arch/sparc64/Kconfig

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,10 @@ config ARCH_MAY_HAVE_PC_FDC
	bool		bool
	default y		default y

			config AUDIT_ARCH
			bool
			default y

	choice		choice
	prompt "Kernel page size"		prompt "Kernel page size"
	default SPARC64_PAGE_SIZE_8KB		default SPARC64_PAGE_SIZE_8KB