Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton: - most of the rest of MM - a small number of misc things - lib/ updates - checkpatch - autofs updates - ipc/ updates * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (126 commits) ipc: optimize semget/shmget/msgget for lots of keys ipc/sem: play nicer with large nsops allocations ipc/sem: drop sem_checkid helper ipc: convert kern_ipc_perm.refcount from atomic_t to refcount_t ipc: convert sem_undo_list.refcnt from atomic_t to refcount_t ipc: convert ipc_namespace.count from atomic_t to refcount_t kcov: support compat processes sh: defconfig: cleanup from old Kconfig options mn10300: defconfig: cleanup from old Kconfig options m32r: defconfig: cleanup from old Kconfig options drivers/pps: use surrounding "if PPS" to remove numerous dependency checks drivers/pps: aesthetic tweaks to PPS-related content cpumask: make cpumask_next() out-of-line kmod: move #ifdef CONFIG_MODULES wrapper to Makefile kmod: split off umh headers into its own file MAINTAINERS: clarify kmod is just a kernel module loader kmod: split out umh code into its own file test_kmod: flip INT checks to be consistent test_kmod: remove paranoid UINT_MAX check on uint range processing vfat: deduplicate hex2bin() ...
This commit is contained in:
@@ -1200,7 +1200,7 @@ static void __init validate_hv(void)
|
||||
* We use a struct cpumask for this, so it must be big enough.
|
||||
*/
|
||||
if ((smp_height * smp_width) > nr_cpu_ids)
|
||||
early_panic("Hypervisor %d x %d grid too big for Linux NR_CPUS %d\n",
|
||||
early_panic("Hypervisor %d x %d grid too big for Linux NR_CPUS %u\n",
|
||||
smp_height, smp_width, nr_cpu_ids);
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user