From 83904d04e189c4166488a5819a3cec559847e0ba Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 30 Mar 2009 10:40:54 +0100 Subject: [PATCH] --- yaml --- r: 139881 b: refs/heads/master c: 5c64e2abb3333684fc662eec776ca61ac009f825 h: refs/heads/master i: 139879: ebd36b1d7cfd661f142fc0396756643acc8f7b51 v: v3 --- [refs] | 2 +- .../arm/mach-gemini/include/mach/system.h | 2 +- trunk/arch/arm/mach-mmp/include/mach/system.h | 2 +- trunk/drivers/sh/maple/maple.c | 2 +- trunk/include/linux/irq.h | 2 + trunk/kernel/sched.c | 15 +++--- trunk/usr/Kconfig | 54 +++++++++++-------- 7 files changed, 47 insertions(+), 32 deletions(-) diff --git a/[refs] b/[refs] index e607f04c9ff2..12bfcd9a7548 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f000328ac10f23f4841b83ddc60eceb3ba0ac176 +refs/heads/master: 5c64e2abb3333684fc662eec776ca61ac009f825 diff --git a/trunk/arch/arm/mach-gemini/include/mach/system.h b/trunk/arch/arm/mach-gemini/include/mach/system.h index bbbd72767a02..4d9c1f872472 100644 --- a/trunk/arch/arm/mach-gemini/include/mach/system.h +++ b/trunk/arch/arm/mach-gemini/include/mach/system.h @@ -28,7 +28,7 @@ static inline void arch_idle(void) cpu_do_idle(); } -static inline void arch_reset(char mode) +static inline void arch_reset(char mode, const char *cmd) { __raw_writel(RESET_GLOBAL | RESET_CPU1, IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET); diff --git a/trunk/arch/arm/mach-mmp/include/mach/system.h b/trunk/arch/arm/mach-mmp/include/mach/system.h index 001edfefec19..4f5b0e0ce6cf 100644 --- a/trunk/arch/arm/mach-mmp/include/mach/system.h +++ b/trunk/arch/arm/mach-mmp/include/mach/system.h @@ -14,7 +14,7 @@ static inline void arch_idle(void) cpu_do_idle(); } -static inline void arch_reset(char mode) +static inline void arch_reset(char mode, const char *cmd) { cpu_reset(0); } diff --git a/trunk/drivers/sh/maple/maple.c b/trunk/drivers/sh/maple/maple.c index cab1ab7cfb78..93c20e135ee1 100644 --- a/trunk/drivers/sh/maple/maple.c +++ b/trunk/drivers/sh/maple/maple.c @@ -776,7 +776,7 @@ static struct maple_driver maple_unsupported_device = { .bus = &maple_bus_type, }, }; -/** +/* * maple_bus_type - core maple bus structure */ struct bus_type maple_bus_type = { diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h index 873e4ac11b81..9c62fbe2ef30 100644 --- a/trunk/include/linux/irq.h +++ b/trunk/include/linux/irq.h @@ -17,9 +17,11 @@ #include #include #include +#include #include #include #include +#include #include #include diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index f4c413bdd38d..5757e03cfac0 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -3190,7 +3190,7 @@ static int move_one_task(struct rq *this_rq, int this_cpu, struct rq *busiest, return 0; } /********** Helpers for find_busiest_group ************************/ -/** +/* * sd_lb_stats - Structure to store the statistics of a sched_domain * during load balancing. */ @@ -3222,7 +3222,7 @@ struct sd_lb_stats { #endif }; -/** +/* * sg_lb_stats - stats of a sched_group required for load_balancing */ struct sg_lb_stats { @@ -3360,16 +3360,17 @@ static inline void update_sd_power_savings_stats(struct sched_group *group, } /** - * check_power_save_busiest_group - Check if we have potential to perform - * some power-savings balance. If yes, set the busiest group to be - * the least loaded group in the sched_domain, so that it's CPUs can - * be put to idle. - * + * check_power_save_busiest_group - see if there is potential for some power-savings balance * @sds: Variable containing the statistics of the sched_domain * under consideration. * @this_cpu: Cpu at which we're currently performing load-balancing. * @imbalance: Variable to store the imbalance. * + * Description: + * Check if we have potential to perform some power-savings balance. + * If yes, set the busiest group to be the least loaded group in the + * sched_domain, so that it's CPUs can be put to idle. + * * Returns 1 if there is potential to perform power-savings balance. * Else returns 0. */ diff --git a/trunk/usr/Kconfig b/trunk/usr/Kconfig index 43a3a0fe8f29..588c588791e2 100644 --- a/trunk/usr/Kconfig +++ b/trunk/usr/Kconfig @@ -46,49 +46,50 @@ config INITRAMFS_ROOT_GID If you are not sure, leave it set to "0". config RD_GZIP - bool "Initial ramdisk compressed using gzip" + bool "Support initial ramdisks compressed using gzip" if EMBEDDED default y - depends on BLK_DEV_INITRD=y + depends on BLK_DEV_INITRD select DECOMPRESS_GZIP help Support loading of a gzip encoded initial ramdisk or cpio buffer. If unsure, say Y. config RD_BZIP2 - bool "Initial ramdisk compressed using bzip2" - default n - depends on BLK_DEV_INITRD=y + bool "Support initial ramdisks compressed using bzip2" if EMBEDDED + default !EMBEDDED + depends on BLK_DEV_INITRD select DECOMPRESS_BZIP2 help Support loading of a bzip2 encoded initial ramdisk or cpio buffer If unsure, say N. config RD_LZMA - bool "Initial ramdisk compressed using lzma" - default n - depends on BLK_DEV_INITRD=y + bool "Support initial ramdisks compressed using LZMA" if EMBEDDED + default !EMBEDDED + depends on BLK_DEV_INITRD select DECOMPRESS_LZMA help - Support loading of a lzma encoded initial ramdisk or cpio buffer + Support loading of a LZMA encoded initial ramdisk or cpio buffer If unsure, say N. +if INITRAMFS_SOURCE!="" + choice prompt "Built-in initramfs compression mode" help - This setting is only meaningful if the INITRAMFS_SOURCE is - set. It decides by which algorithm the INITRAMFS_SOURCE will - be compressed. - Several compression algorithms are available, which differ - in efficiency, compression and decompression speed. - Compression speed is only relevant when building a kernel. - Decompression speed is relevant at each boot. - - If you have any problems with bzip2 or lzma compressed + This option decides by which algorithm the builtin initramfs + will be compressed. Several compression algorithms are + available, which differ in efficiency, compression and + decompression speed. Compression speed is only relevant + when building a kernel. Decompression speed is relevant at + each boot. + + If you have any problems with bzip2 or LZMA compressed initramfs, mail me (Alain Knaff) . - High compression options are mostly useful for users who - are low on disk space (embedded systems), but for whom ram - size matters less. + High compression options are mostly useful for users who are + low on RAM, since it reduces the memory consumption during + boot. If in doubt, select 'gzip' @@ -133,3 +134,14 @@ config INITRAMFS_COMPRESSION_LZMA smaller with LZMA in comparison to gzip. endchoice + +endif + +if INITRAMFS_SOURCE="" +# The builtin initramfs is so small so we don't want to bug the user... + +config INITRAMFS_COMPRESSION_NONE + bool + default y + +endif