The patch titled
FDPIC: Move roundup() into linux/kernel.h
has been removed from the -mm tree. Its filename is
fdpic-move-roundup-into-linux-kernelh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
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.
[akpm@xxxxxxxx: nuke all the other implementations]
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/mips/kernel/irixelf.c | 2 --
drivers/scsi/aic7xxx/aic79xx_osm.h | 1 -
fs/binfmt_elf.c | 2 --
fs/proc/kcore.c | 2 --
fs/xfs/linux-2.6/xfs_linux.h | 1 -
include/linux/kernel.h | 1 +
6 files changed, 1 insertion(+), 8 deletions(-)
diff -puN arch/mips/kernel/irixelf.c~fdpic-move-roundup-into-linux-kernelh arch/mips/kernel/irixelf.c
--- a/arch/mips/kernel/irixelf.c~fdpic-move-roundup-into-linux-kernelh
+++ a/arch/mips/kernel/irixelf.c
@@ -999,8 +999,6 @@ static inline int maydump(struct vm_area
return 1;
}
-#define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
-
/* An ELF note in memory. */
struct memelfnote
{
diff -puN drivers/scsi/aic7xxx/aic79xx_osm.h~fdpic-move-roundup-into-linux-kernelh drivers/scsi/aic7xxx/aic79xx_osm.h
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h~fdpic-move-roundup-into-linux-kernelh
+++ a/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -93,7 +93,6 @@
#endif
/********************************** Misc Macros *******************************/
-#define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
#define powerof2(x) ((((x)-1)&(x))==0)
/************************* Forward Declarations *******************************/
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 fs/proc/kcore.c~fdpic-move-roundup-into-linux-kernelh fs/proc/kcore.c
--- a/fs/proc/kcore.c~fdpic-move-roundup-into-linux-kernelh
+++ a/fs/proc/kcore.c
@@ -42,8 +42,6 @@ const struct file_operations proc_kcore_
#define kc_offset_to_vaddr(o) ((o) + PAGE_OFFSET)
#endif
-#define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
-
/* An ELF note in memory */
struct memelfnote
{
diff -puN fs/xfs/linux-2.6/xfs_linux.h~fdpic-move-roundup-into-linux-kernelh fs/xfs/linux-2.6/xfs_linux.h
--- a/fs/xfs/linux-2.6/xfs_linux.h~fdpic-move-roundup-into-linux-kernelh
+++ a/fs/xfs/linux-2.6/xfs_linux.h
@@ -215,7 +215,6 @@ BUFFER_FNS(PrivateStart, unwritten);
#define MIN(a,b) (min(a,b))
#define MAX(a,b) (max(a,b))
#define howmany(x, y) (((x)+((y)-1))/(y))
-#define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
/*
* Various platform dependent calls that don't fit anywhere else
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
@@ -33,6 +33,7 @@ extern const char linux_banner[];
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
+#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
origin.patch
git-gfs2.patch
binfmt_elf-consistently-use-loff_t.patch
nommu-export-two-symbols-for-drivers-to-use.patch
ecryptfs-get_sb_dev-fix.patch
reiser4-get_sb_dev-fix.patch
mutex-subsystem-synchro-test-module.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
