tty: remove buffer special casing
Long long ago a 4K kmalloc allocated two pages so the tty layer used the page allocator, except on some machines where the page size was huge. This was removed from the core tty layer with the tty buffer re-implementation but not from tty_audit or the n_tty ldisc. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
aba6593bf7
Коммит
c481c707fe
|
@ -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,
|
||||
|
|
|
@ -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 @@ err:
|
|||
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);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче