Skip to contentSkip to conversation

ROUND_UP macro cleanup in arch/alpha/kernel/osf_sys.c

PATCH New Milind Arun Choudhary 1 participant 1 message Apr 5, 2007

Subsystems (2)
Kernel janitors Alpha port
lore
Share & tools
lore

Milind Arun Choudhary

author
#0 lore raw

PATCH 1/1 ROUND_UP macro cleanup in arch/alpha/kernel/osf_sys.c

ROUND_UP macro cleanup use ALIGN

Signed-off-by Milind Arun Choudhary <[email protected]>

---

 osf_sys.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)
arch/alpha/kernel/osf_sys.c +1 -3
index be133f1..c77d231 100644
@@ -93,7 +93,6 @@ osf_set_program_attributes(unsigned long text_start, unsigned long text_len,
  * 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 *name, int namlen, loff_t offset,
 {
 	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, struct osf_dirent __user *dirent,
 	return error;
 }
 
-#undef ROUND_UP
 #undef NAME_OFFSET
 
 asmlinkage unsigned long
Signature · 1 line
Milind Arun Choudhary