From d1a144374849061e791957432d8362a8bd786a1c Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 11 Jun 2009 13:04:27 +0100 Subject: [PATCH] --- yaml --- r: 146270 b: refs/heads/master c: c481c707fe4b07783d9a2499a9bbbb94497e9b18 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/n_tty.c | 11 ++--------- trunk/drivers/char/tty_audit.c | 10 ++-------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 1e00492ce707..79177fd6a436 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aba6593bf77371e71331ba76dacc98b47760cba3 +refs/heads/master: c481c707fe4b07783d9a2499a9bbbb94497e9b18 diff --git a/trunk/drivers/char/n_tty.c b/trunk/drivers/char/n_tty.c index f6f0e4ec2b51..b4b12b4f0ac4 100644 --- a/trunk/drivers/char/n_tty.c +++ b/trunk/drivers/char/n_tty.c @@ -76,19 +76,12 @@ static inline unsigned char *alloc_buf(void) { gfp_t prio = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL; - - if (PAGE_SIZE != N_TTY_BUF_SIZE) - return kmalloc(N_TTY_BUF_SIZE, prio); - else - return (unsigned char *)__get_free_page(prio); + return kmalloc(N_TTY_BUF_SIZE, prio); } static inline void free_buf(unsigned char *buf) { - if (PAGE_SIZE != N_TTY_BUF_SIZE) - kfree(buf); - else - free_page((unsigned long) buf); + kfree(buf); } static inline int tty_put_user(struct tty_struct *tty, unsigned char x, diff --git a/trunk/drivers/char/tty_audit.c b/trunk/drivers/char/tty_audit.c index 55ba6f142883..ac16fbec72d0 100644 --- a/trunk/drivers/char/tty_audit.c +++ b/trunk/drivers/char/tty_audit.c @@ -29,10 +29,7 @@ static struct tty_audit_buf *tty_audit_buf_alloc(int major, int minor, buf = kmalloc(sizeof(*buf), GFP_KERNEL); if (!buf) goto err; - if (PAGE_SIZE != N_TTY_BUF_SIZE) - buf->data = kmalloc(N_TTY_BUF_SIZE, GFP_KERNEL); - else - buf->data = (unsigned char *)__get_free_page(GFP_KERNEL); + buf->data = kmalloc(N_TTY_BUF_SIZE, GFP_KERNEL); if (!buf->data) goto err_buf; atomic_set(&buf->count, 1); @@ -52,10 +49,7 @@ static struct tty_audit_buf *tty_audit_buf_alloc(int major, int minor, static void tty_audit_buf_free(struct tty_audit_buf *buf) { WARN_ON(buf->valid != 0); - if (PAGE_SIZE != N_TTY_BUF_SIZE) - kfree(buf->data); - else - free_page((unsigned long)buf->data); + kfree(buf->data); kfree(buf); }