Commit 48b8eb0c authored by Linus Torvalds's avatar Linus Torvalds

Automerge

parents a14f13f8 34610152
......@@ -102,7 +102,7 @@ quirk_cypress(struct pci_dev *dev)
#define DMAPSZ (max_low_pfn << PAGE_SHIFT) /* memory size, not window size */
if ((__direct_map_base + DMAPSZ - 1) >= 0xfff00000UL) {
__direct_map_size = 0xfff00000UL - __direct_map_base;
printk("%s: adjusting direct map size to 0x%x\n",
printk("%s: adjusting direct map size to 0x%lx\n",
__FUNCTION__, __direct_map_size);
} else {
struct pci_controller *hose = dev->sysdata;
......
......@@ -86,7 +86,9 @@ static unsigned long rtc_port;
static int rtc_irq = PCI_IRQ_NONE;
#endif
#if RTC_IRQ
static int rtc_has_irq = 1;
#endif
/*
* We sponge a minor off of the misc major. No need slurping
......@@ -99,7 +101,9 @@ static struct fasync_struct *rtc_async_queue;
static DECLARE_WAIT_QUEUE_HEAD(rtc_wait);
#if RTC_IRQ
static struct timer_list rtc_irq_timer;
#endif
static ssize_t rtc_read(struct file *file, char *buf,
size_t count, loff_t *ppos);
......
......@@ -437,7 +437,7 @@ struct atapi_mechstat_header {
byte curlba[3];
byte nslots;
__u8 short slot_tablelen;
__u8 slot_tablelen;
};
......
......@@ -1885,7 +1885,7 @@ static int __register_serial(struct serial_struct *req, int line)
port.line = line;
if (HIGH_BITS_OFFSET)
port.iobase |= req->port_high << HIGH_BITS_OFFSET;
port.iobase |= (long) req->port_high << HIGH_BITS_OFFSET;
/*
* If a clock rate wasn't specified by the low level
......
......@@ -593,7 +593,7 @@ static int uart_get_info(struct uart_info *info, struct serial_struct *retinfo)
tmp.line = port->line;
tmp.port = port->iobase;
if (HIGH_BITS_OFFSET)
tmp.port_high = port->iobase >> HIGH_BITS_OFFSET;
tmp.port_high = (long) port->iobase >> HIGH_BITS_OFFSET;
tmp.irq = port->irq;
tmp.flags = port->flags | info->flags;
tmp.xmit_fifo_size = port->fifosize;
......
......@@ -342,7 +342,8 @@ struct inode * ext2_new_inode(struct inode * dir, int mode)
if (ino < EXT2_FIRST_INO(sb) || ino > le32_to_cpu(es->s_inodes_count)) {
ext2_error (sb, "ext2_new_inode",
"reserved inode or inode > inodes count - "
"block_group = %d,inode=%ld", group, ino);
"block_group = %d,inode=%lu", group,
(unsigned long) ino);
err = -EIO;
goto fail2;
}
......
......@@ -952,12 +952,13 @@ static struct ext2_inode *ext2_get_inode(struct super_block *sb, ino_t ino,
return (struct ext2_inode *) (bh->b_data + offset);
Einval:
ext2_error(sb, "ext2_get_inode", "bad inode number: %lu", ino);
ext2_error(sb, "ext2_get_inode", "bad inode number: %lu",
(unsigned long) ino);
return ERR_PTR(-EINVAL);
Eio:
ext2_error(sb, "ext2_get_inode",
"unable to read inode block - inode=%lu, block=%lu",
ino, block);
(unsigned long) ino, block);
Egdp:
return ERR_PTR(-EIO);
}
......@@ -1076,7 +1077,8 @@ static int ext2_update_inode(struct inode * inode, int do_sync)
return -EIO;
if (ino == EXT2_ACL_IDX_INO || ino == EXT2_ACL_DATA_INO) {
ext2_error (sb, "ext2_write_inode", "bad inode number: %lu", ino);
ext2_error (sb, "ext2_write_inode", "bad inode number: %lu",
(unsigned long) ino);
brelse(bh);
return -EIO;
}
......@@ -1146,7 +1148,7 @@ static int ext2_update_inode(struct inode * inode, int do_sync)
wait_on_buffer (bh);
if (buffer_req(bh) && !buffer_uptodate(bh)) {
printk ("IO error syncing ext2 inode [%s:%08lx]\n",
sb->s_id, ino);
sb->s_id, (unsigned long) ino);
err = -EIO;
}
}
......
......@@ -458,7 +458,8 @@ struct inode *ext3_orphan_get (struct super_block * sb, ino_t ino)
/* Error cases - e2fsck has already cleaned up for us */
if (ino > max_ino) {
ext3_warning(sb, __FUNCTION__,
"bad orphan ino %ld! e2fsck was run?\n", ino);
"bad orphan ino %lu! e2fsck was run?\n",
(unsigned long) ino);
goto out;
}
......@@ -467,7 +468,8 @@ struct inode *ext3_orphan_get (struct super_block * sb, ino_t ino)
bitmap_bh = read_inode_bitmap(sb, block_group);
if (!bitmap_bh) {
ext3_warning(sb, __FUNCTION__,
"inode bitmap error for orphan %ld\n", ino);
"inode bitmap error for orphan %lu\n",
(unsigned long) ino);
goto out;
}
......@@ -490,7 +492,8 @@ struct inode *ext3_orphan_get (struct super_block * sb, ino_t ino)
is_bad_inode(inode));
printk(KERN_NOTICE "NEXT_ORPHAN(inode)=%d\n",
NEXT_ORPHAN(inode));
printk(KERN_NOTICE "max_ino=%ld\n", max_ino);
printk(KERN_NOTICE "max_ino=%lu\n",
(unsigned long) max_ino);
}
/* Avoid freeing blocks if we got a bad deleted inode */
if (inode && inode->i_nlink == 0)
......
......@@ -781,7 +781,8 @@ exp_unexport(struct nfsctl_export *nxp)
expkey_put(&key->h, &svc_expkey_cache);
} else
dprintk("nfsd: no export %x/%lx for %s\n",
nxp->ex_dev, nxp->ex_ino, nxp->ex_client);
nxp->ex_dev, (unsigned long) nxp->ex_ino,
nxp->ex_client);
auth_domain_put(dom);
cache_flush();
} else
......
......@@ -58,8 +58,10 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
Eventually, it would be nice if the ECOFF core-dump had to do the
translation, then ELF_CORE_COPY_REGS() would become trivial and
faster. */
#define ELF_CORE_COPY_REGS(_dest,_regs) \
{ \
extern void dump_thread(struct pt_regs *, struct user *); \
struct user _dump; \
\
dump_thread(_regs, &_dump); \
......
......@@ -33,7 +33,7 @@ __reload_thread(struct pcb_struct *pcb)
"call_pal %2 #__reload_thread"
: "=r"(v0), "=r"(a0)
: "i"(PAL_swpctx), "r"(a0)
: "$1", "$16", "$22", "$23", "$24", "$25");
: "$1", "$22", "$23", "$24", "$25");
return v0;
}
......
......@@ -12,7 +12,7 @@ typedef unsigned int __kernel_ino_t;
typedef unsigned int __kernel_mode_t;
typedef unsigned int __kernel_nlink_t;
typedef long __kernel_off_t;
typedef long __kernel_loff_t;
typedef long long __kernel_loff_t;
typedef int __kernel_pid_t;
typedef int __kernel_ipc_pid_t;
typedef unsigned int __kernel_uid_t;
......
......@@ -274,8 +274,8 @@ static const struct gtype##_id * __module_##gtype##_table \
*/
#define MODULE_LICENSE(license) \
static const char __module_license[] __attribute__((section(".modinfo"))) = \
"license=" license
static const char __module_license[] \
__attribute__((section(".modinfo"), unused)) = "license=" license
/* Define the module variable, and usage macros. */
extern struct module __this_module;
......@@ -286,11 +286,13 @@ extern struct module __this_module;
#define MOD_IN_USE __MOD_IN_USE(THIS_MODULE)
#include <linux/version.h>
static const char __module_kernel_version[] __attribute__((section(".modinfo"))) =
"kernel_version=" UTS_RELEASE;
static const char __module_kernel_version[]
__attribute__((section(".modinfo"), unused)) =
"kernel_version=" UTS_RELEASE;
#ifdef CONFIG_MODVERSIONS
static const char __module_using_checksums[] __attribute__((section(".modinfo"))) =
"using_checksums=1";
static const char __module_using_checksums[]
__attribute__((section(".modinfo"), unused)) =
"using_checksums=1";
#endif
#else /* MODULE */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment