The patch titled
sparc build breakage
has been added to the -mm tree. Its filename is
sparc-build-breakage.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sparc build breakage
From: Al Viro <viro@xxxxxxxxxxxxxxxx>
rd_prompt et.al. depend on CONFIG_BLK_DEV_RAM, not CONFIG_BLK_INITRD; now
that those are independent, setup.c blows with INITRD on and BLK_DEV_RAM
off.
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: William Lee Irwin III <wli@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/sparc/kernel/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/sparc/kernel/setup.c~sparc-build-breakage arch/sparc/kernel/setup.c
--- a/arch/sparc/kernel/setup.c~sparc-build-breakage
+++ a/arch/sparc/kernel/setup.c
@@ -331,7 +331,7 @@ void __init setup_arch(char **cmdline_p)
if (!root_flags)
root_mountflags &= ~MS_RDONLY;
ROOT_DEV = old_decode_dev(root_dev);
-#ifdef CONFIG_BLK_DEV_INITRD
+#ifdef CONFIG_BLK_DEV_RAM
rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);
_
Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxx are
sparc-build-breakage.patch
sctp_unpack_cookie-fix.patch
fix-broken-uses-of-nipquad-in-net-atm.patch
kill-open-coded-offsetof-in-cm4000_csc-zero_dev.patch
m68k-trapsc-constraints.patch
m68k-windfarm-is-powerpc-only-dont-do-it-on-m68k-macs.patch
inotify-add-names-inode-to-event-handler.patch
inotify-add-interfaces-to-kernel-api.patch
inotify-allow-watch-removal-from-event-handler.patch
inotify-update-kernel-documentation.patch
affs_fill_super-%s-abuses.patch
slab-leaks3-default-y.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
