diff options
| -rw-r--r-- | drivers/char/cyclades.c | 2 | ||||
| -rw-r--r-- | drivers/char/mxser.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/devices/blkmtd.c | 2 | ||||
| -rw-r--r-- | fs/jbd/transaction.c | 2 | ||||
| -rw-r--r-- | include/linux/sched.h | 2 |
5 files changed, 3 insertions, 6 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index db038bbcfdbb..f0f0693da625 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c @@ -5665,7 +5665,7 @@ void cy_cleanup_module(void) { int i; - int e1, e2; + int e1; unsigned long flags; #ifndef CONFIG_CYZ_INTR diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 1df25a26f88d..360df346a559 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c @@ -498,7 +498,6 @@ static int __init mxser_module_init(void) { int i, m, retval, b; int n, index; - int ret1, ret2; struct mxser_hwconf hwconf; mxvar_sdriver = alloc_tty_driver(MXSER_PORTS + 1); diff --git a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c index fe2102690862..402be306827a 100644 --- a/drivers/mtd/devices/blkmtd.c +++ b/drivers/mtd/devices/blkmtd.c @@ -710,7 +710,7 @@ static int blkmtd_write(struct mtd_info *mtd, loff_t to, size_t len, struct page **pages; int pagecnt = 0; char b[BDEVNAME_SIZE]; -21 e3 + *retlen = 0; DEBUG(2, "blkmtd: write: dev = `%s' to = %ld len = %d buf = %p\n", bdevname(rawdevice->binding, b), (long int)to, len, buf); diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index fd274a984f34..83de01cd53f5 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c @@ -1088,7 +1088,6 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) transaction_t *transaction = handle->h_transaction; journal_t *journal = transaction->t_journal; struct journal_head *jh = bh2jh(bh); - int console_loglevel_saved = console_loglevel; jbd_debug(5, "journal_head %p\n", jh); JBUFFER_TRACE(jh, "entry"); @@ -1147,7 +1146,6 @@ out_unlock_bh: jbd_unlock_bh_state(bh); out: JBUFFER_TRACE(jh, "exit"); - console_loglevel = console_loglevel_saved; return 0; } diff --git a/include/linux/sched.h b/include/linux/sched.h index b20db4e5fbfa..a7e52205b47a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -485,7 +485,7 @@ do { if (atomic_dec_and_test(&(tsk)->usage)) __put_task_struct(tsk); } while(0) #define PF_FSTRANS 0x00020000 /* inside a filesystem transaction */ #define PF_KSWAPD 0x00040000 /* I am kswapd */ #define PF_SWAPOFF 0x00080000 /* I am in swapoff */ -#define PF_LESS_THROTTLE 0x01000000 /* Throttle me less: I clena memory */ +#define PF_LESS_THROTTLE 0x00100000 /* Throttle me less: I clean memory */ #define PF_SYNCWRITE 0x00200000 /* I am doing a sync write */ #define PF_READAHEAD 0x00400000 /* I am doing read-ahead */ |