diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 13 | ||||
| -rw-r--r-- | init/do_mounts_rd.c | 7 |
2 files changed, 4 insertions, 16 deletions
diff --git a/init/Kconfig b/init/Kconfig index 5481b49e8c3f..5b86082fa238 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -285,7 +285,7 @@ config FHANDLE config USELIB bool "uselib syscall" - default y + def_bool ALPHA || M68K || SPARC || X86_32 || IA32_EMULATION help This option enables the uselib syscall, a system call used in the dynamic linker from libc5 and earlier. glibc does not use this @@ -299,20 +299,15 @@ config AUDIT help Enable auditing infrastructure that can be used with another kernel subsystem, such as SELinux (which requires this for - logging of avc messages output). Does not do system-call - auditing without CONFIG_AUDITSYSCALL. + logging of avc messages output). System call auditing is included + on architectures which support it. config HAVE_ARCH_AUDITSYSCALL bool config AUDITSYSCALL - bool "Enable system-call auditing support" + def_bool y depends on AUDIT && HAVE_ARCH_AUDITSYSCALL - default y if SECURITY_SELINUX - help - Enable low-overhead system-call auditing infrastructure that - can be used independently or with another kernel subsystem, - such as SELinux. config AUDIT_WATCH def_bool y diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index e5d059e8aa11..8a09b32e07d6 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c @@ -216,13 +216,6 @@ int __init rd_load_image(char *from) /* * NOTE NOTE: nblocks is not actually blocks but * the number of kibibytes of data to load into a ramdisk. - * So any ramdisk block size that is a multiple of 1KiB should - * work when the appropriate ramdisk_blocksize is specified - * on the command line. - * - * The default ramdisk_blocksize is 1KiB and it is generally - * silly to use anything else, so make sure to use 1KiB - * blocksize while generating ext2fs ramdisk-images. */ if (sys_ioctl(out_fd, BLKGETSIZE, (unsigned long)&rd_blocks) < 0) rd_blocks = 0; |