The patch titled
ROUND_UP macro cleanup in arch/alpha/kernel/osf_sys.c
has been added to the -mm tree. Its filename is
round_up-macro-cleanup-in-arch-alpha-kernel-osf_sysc.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ROUND_UP macro cleanup in arch/alpha/kernel/osf_sys.c
From: Milind Arun Choudhary <milindchoudhary@xxxxxxxxx>
ROUND_UP macro cleanup use ALIGN
Signed-off-by: Milind Arun Choudhary <milindchoudhary@xxxxxxxxx>
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/kernel/osf_sys.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff -puN arch/alpha/kernel/osf_sys.c~round_up-macro-cleanup-in-arch-alpha-kernel-osf_sysc arch/alpha/kernel/osf_sys.c
--- a/arch/alpha/kernel/osf_sys.c~round_up-macro-cleanup-in-arch-alpha-kernel-osf_sysc
+++ a/arch/alpha/kernel/osf_sys.c
@@ -93,7 +93,6 @@ osf_set_program_attributes(unsigned long
* offset differences aren't the same as "d_reclen").
*/
#define NAME_OFFSET offsetof (struct osf_dirent, d_name)
-#define ROUND_UP(x) (((x)+3) & ~3)
struct osf_dirent {
unsigned int d_ino;
@@ -115,7 +114,7 @@ osf_filldir(void *__buf, const char *nam
{
struct osf_dirent __user *dirent;
struct osf_dirent_callback *buf = (struct osf_dirent_callback *) __buf;
- unsigned int reclen = ROUND_UP(NAME_OFFSET + namlen + 1);
+ unsigned int reclen = ALIGN(NAME_OFFSET + namlen + 1, sizeof(u32));
unsigned int d_ino;
buf->error = -EINVAL; /* only used if we fail */
@@ -174,7 +173,6 @@ osf_getdirentries(unsigned int fd, struc
return error;
}
-#undef ROUND_UP
#undef NAME_OFFSET
asmlinkage unsigned long
_
Patches currently in -mm which might be from milindchoudhary@xxxxxxxxx are
unused-round_up-name_offset-macro-in-arch-powerpc.patch
round_up-macro-cleanup-in-drivers-net-ppp_genericc.patch
round_up-macro-cleanup-in-drivers-parisc.patch
round_up-macro-cleanup-in-drivers-pci.patch
round_up-macro-cleanup-in-arch-alpha-kernel-osf_sysc.patch
round_up-macro-cleanup-in-drivers-char-lpc.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
