diff --git a/[refs] b/[refs] index 50640bc944c9..b33eba2c2e89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2d550736f8b2186b8ef7e206d0bfbfec2238ae8 +refs/heads/master: 621a4d1a823e1ec631fbfbe6e53ad036e2d2abc6 diff --git a/trunk/drivers/char/n_tty.c b/trunk/drivers/char/n_tty.c index 09103b3d8f05..c9bdf544ed2c 100644 --- a/trunk/drivers/char/n_tty.c +++ b/trunk/drivers/char/n_tty.c @@ -62,7 +62,7 @@ static inline unsigned char *alloc_buf(void) { - int prio = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL; + unsigned int prio = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL; if (PAGE_SIZE != N_TTY_BUF_SIZE) return kmalloc(N_TTY_BUF_SIZE, prio);