diff options
| -rw-r--r-- | drivers/block/nbd.c | 3 | ||||
| -rw-r--r-- | drivers/char/agp/i460-agp.c | 2 | ||||
| -rw-r--r-- | fs/jbd/transaction.c | 13 | ||||
| -rw-r--r-- | include/linux/hfs_sysdep.h | 3 | ||||
| -rw-r--r-- | mm/slab.c | 4 | ||||
| -rw-r--r-- | sound/isa/cmi8330.c | 2 | ||||
| -rw-r--r-- | sound/isa/es18xx.c | 2 |
7 files changed, 7 insertions, 22 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index cc9c34b09839..d57f3abf6e5e 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -258,7 +258,8 @@ void nbd_send_req(struct nbd_device *lo, struct request *req) dprintk(DBG_TX, "%s: request %p: sending control (%s@%llu,%luB)\n", lo->disk->disk_name, req, nbdcmd_to_ascii(nbd_cmd(req)), - req->sector << 9, req->nr_sectors << 9); + (unsigned long long)req->sector << 9, + req->nr_sectors << 9); result = sock_xmit(sock, 1, &request, sizeof(request), (nbd_cmd(req) == NBD_CMD_WRITE)? MSG_MORE: 0); if (result <= 0) { diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c index 263e7de4f115..23f5cece5634 100644 --- a/drivers/char/agp/i460-agp.c +++ b/drivers/char/agp/i460-agp.c @@ -608,7 +608,7 @@ static struct pci_driver agp_intel_i460_pci_driver = { .name = "agpgart-intel-i460", .id_table = agp_intel_i460_pci_table, .probe = agp_intel_i460_probe, - .remove = agp_intel_i460_remove, + .remove = __devexit_p(agp_intel_i460_remove), }; static int __init agp_intel_i460_init(void) diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 1423dadf3db9..2861ee44cb11 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c @@ -1106,16 +1106,6 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) if (jh->b_transaction == handle->h_transaction && jh->b_jlist == BJ_Metadata) { JBUFFER_TRACE(jh, "fastpath"); - console_verbose(); - if (jh->b_transaction != journal->j_running_transaction) { - printk("jh->b_transaction=%p\n", jh->b_transaction); - printk("journal->j_running_transaction=%p\n", - journal->j_running_transaction); - printk("handle->h_transaction=%p\n", - handle->h_transaction); - printk("journal->j_committing_transaction=%p\n", - journal->j_committing_transaction); - } J_ASSERT_JH(jh, jh->b_transaction == journal->j_running_transaction); goto out_unlock_bh; @@ -1328,9 +1318,6 @@ int journal_stop(handle_t *handle) journal_t *journal = transaction->t_journal; int old_handle_count, err; - if (!handle) - return 0; - J_ASSERT(transaction->t_updates > 0); J_ASSERT(journal_current_handle() == handle); diff --git a/include/linux/hfs_sysdep.h b/include/linux/hfs_sysdep.h index 1468ef02e8b6..4c4e3eba0963 100644 --- a/include/linux/hfs_sysdep.h +++ b/include/linux/hfs_sysdep.h @@ -28,9 +28,6 @@ extern struct timezone sys_tz; -#undef offsetof -#define offsetof(TYPE, MEMB) ((size_t) &((TYPE *)0)->MEMB) - /* Typedefs for integer types by size and signedness */ typedef __u8 hfs_u8; typedef __u16 hfs_u16; diff --git a/mm/slab.c b/mm/slab.c index bee3dfdf8619..4576d24523c0 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2482,11 +2482,11 @@ static void *s_start(struct seq_file *m, loff_t *pos) seq_puts(m, "slabinfo - version: 2.0\n"); #endif seq_puts(m, "# name <active_objs> <num_objs> <objsize> <objperslab> <pagesperslab>"); - seq_puts(m, " : tunables <batchcount> <limit <sharedfactor>"); + seq_puts(m, " : tunables <batchcount> <limit> <sharedfactor>"); seq_puts(m, " : slabdata <active_slabs> <num_slabs> <sharedavail>"); #if STATS seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> <error> <maxfreeable> <freelimit>"); - seq_puts(m, " : cpustat <allochit <allocmiss <freehit <freemiss>"); + seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit <freemiss>"); #endif seq_putc(m, '\n'); } diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index 226ffd299f3c..f3f3d6b12aba 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c @@ -293,7 +293,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard, const struct pnp_card_device_id *id) { struct pnp_dev *pdev; - struct pnp_resource_table * cfg = kmalloc(GFP_ATOMIC, sizeof(struct pnp_resource_table)); + struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_ATOMIC); int err; acard->cap = pnp_request_card_device(card, id->devs[0].id, NULL); diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index b52983f47a0c..5b3b49163071 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c @@ -1966,7 +1966,7 @@ static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard, const struct pnp_card_device_id *id) { struct pnp_dev *pdev; - struct pnp_resource_table * cfg = kmalloc(GFP_ATOMIC, sizeof(struct pnp_resource_table)); + struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_ATOMIC); int err; if (!cfg) |