The patch titled
FDPIC: Move roundup() into linux/kernel.h
has been added to the -mm tree. Its filename is
fdpic-move-roundup-into-linux-kernelh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: FDPIC: Move roundup() into linux/kernel.h
From: David Howells <dhowells@xxxxxxxxxx>
Move the roundup() macro from binfmt_elf.c into linux/kernel.h as it's
generally useful.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/binfmt_elf.c | 2 --
include/linux/kernel.h | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff -puN fs/binfmt_elf.c~fdpic-move-roundup-into-linux-kernelh fs/binfmt_elf.c
--- a/fs/binfmt_elf.c~fdpic-move-roundup-into-linux-kernelh
+++ a/fs/binfmt_elf.c
@@ -1185,8 +1185,6 @@ static int maydump(struct vm_area_struct
return 1;
}
-#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
-
/* An ELF note in memory */
struct memelfnote
{
diff -puN include/linux/kernel.h~fdpic-move-roundup-into-linux-kernelh include/linux/kernel.h
--- a/include/linux/kernel.h~fdpic-move-roundup-into-linux-kernelh
+++ a/include/linux/kernel.h
@@ -35,6 +35,7 @@ extern const char linux_banner[];
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
#define KERN_EMERG "<0>" /* system is unusable */
#define KERN_ALERT "<1>" /* action must be taken immediately */
_
Patches currently in -mm which might be from dhowells@xxxxxxxxxx are
lockdep-add-more-rwsemh-documentation.patch
vfs-documentation-tweak.patch
git-gfs2.patch
binfmt_elf-consistently-use-loff_t.patch
fdpic-fix-fdpic-compile-errors-2.patch
frv-fix-frv-arch-compile-errors.patch
nommu-fix-execution-off-of-ramfs-with-mmap.patch
fdpic-adjust-the-elf-fdpic-driver-to-conform-more-to-the-codingstyle.patch
fdpic-define-seek_-constants-in-the-linux-kernel-headers.patch
fdpic-move-roundup-into-linux-kernelh.patch
fdpic-add-coredump-capability-for-the-elf-fdpic-binfmt.patch
frv-introduce-asm-offsets-for-frv-arch.patch
ecryptfs-get_sb_dev-fix.patch
reiser4-get_sb_dev-fix.patch
mutex-subsystem-synchro-test-module.patch
frv-fix-frv-arch-compile-errors-4.patch
nommu-fix-execution-off-of-ramfs-with-mmap-4.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
