Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 109395
b: refs/heads/master
c: 71fc9fc
h: refs/heads/master
i:
  109393: ec07fdc
  109391: bd0b0a2
v: v3
  • Loading branch information
Kevin Hilman authored and Bartlomiej Zolnierkiewicz committed Sep 2, 2008
1 parent 19249a2 commit 1304bb1
Show file tree
Hide file tree
Showing 42 changed files with 111 additions and 272 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ba6271ea6324decab4c47c4a55de95188d930792
refs/heads/master: 71fc9fcc70e6ad96215510c1dbcbade05cd95e41
2 changes: 0 additions & 2 deletions trunk/Documentation/dontdiff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
*.css
*.dvi
*.eps
*.fw.gen.S
*.fw
*.gif
*.grep
*.grp
Expand Down
9 changes: 3 additions & 6 deletions trunk/arch/m68k/atari/atakeyb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,15 +580,13 @@ int atari_keyb_init(void)
do {
/* reset IKBD ACIA */
acia.key_ctrl = ACIA_RESET |
((atari_switches & ATARI_SWITCH_IKBD) ?
ACIA_RHTID : 0);
(atari_switches & ATARI_SWITCH_IKBD) ? ACIA_RHTID : 0;
(void)acia.key_ctrl;
(void)acia.key_data;

/* reset MIDI ACIA */
acia.mid_ctrl = ACIA_RESET |
((atari_switches & ATARI_SWITCH_MIDI) ?
ACIA_RHTID : 0);
(atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0;
(void)acia.mid_ctrl;
(void)acia.mid_data;

Expand All @@ -601,8 +599,7 @@ int atari_keyb_init(void)
ACIA_RHTID : ACIA_RLTID);

acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S |
((atari_switches & ATARI_SWITCH_MIDI) ?
ACIA_RHTID : 0);
(atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0;

/* make sure the interrupt line is up */
} while ((mfp.par_dt_reg & 0x10) == 0);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/parisc/hpux/fs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
buf->count -= reclen;
return 0;
Efault:
buf->error = -EFAULT;
buffer->error = -EFAULT;
return -EFAULT;
}

Expand Down
25 changes: 10 additions & 15 deletions trunk/arch/sparc/include/asm/smp_32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,39 +50,34 @@ struct seq_file;
void smp_bogo(struct seq_file *);
void smp_info(struct seq_file *);

BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, cpumask_t, unsigned long, unsigned long, unsigned long, unsigned long)
BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long)
BTFIXUPDEF_CALL(int, __hard_smp_processor_id, void)
BTFIXUPDEF_BLACKBOX(hard_smp_processor_id)
BTFIXUPDEF_BLACKBOX(load_current)

#define smp_cross_call(func,mask,arg1,arg2,arg3,arg4) BTFIXUP_CALL(smp_cross_call)(func,mask,arg1,arg2,arg3,arg4)
#define smp_cross_call(func,arg1,arg2,arg3,arg4,arg5) BTFIXUP_CALL(smp_cross_call)(func,arg1,arg2,arg3,arg4,arg5)

static inline void xc0(smpfunc_t func) { smp_cross_call(func, cpu_online_map, 0, 0, 0, 0); }
static inline void xc0(smpfunc_t func) { smp_cross_call(func, 0, 0, 0, 0, 0); }
static inline void xc1(smpfunc_t func, unsigned long arg1)
{ smp_cross_call(func, cpu_online_map, arg1, 0, 0, 0); }
{ smp_cross_call(func, arg1, 0, 0, 0, 0); }
static inline void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2)
{ smp_cross_call(func, cpu_online_map, arg1, arg2, 0, 0); }
{ smp_cross_call(func, arg1, arg2, 0, 0, 0); }
static inline void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2,
unsigned long arg3)
{ smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, 0); }
{ smp_cross_call(func, arg1, arg2, arg3, 0, 0); }
static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2,
unsigned long arg3, unsigned long arg4)
{ smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, arg4); }
{ smp_cross_call(func, arg1, arg2, arg3, arg4, 0); }
static inline void xc5(smpfunc_t func, unsigned long arg1, unsigned long arg2,
unsigned long arg3, unsigned long arg4, unsigned long arg5)
{ smp_cross_call(func, arg1, arg2, arg3, arg4, arg5); }

static inline int smp_call_function(void (*func)(void *info), void *info, int wait)
{
xc1((smpfunc_t)func, (unsigned long)info);
return 0;
}

static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
void *info, int wait)
{
smp_cross_call((smpfunc_t)func, cpumask_of_cpu(cpuid),
(unsigned long) info, 0, 0, 0);
return 0;
}

static inline int cpu_logical_map(int cpu)
{
return cpu;
Expand Down
19 changes: 5 additions & 14 deletions trunk/arch/sparc/kernel/of_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ struct of_bus {
int *addrc, int *sizec);
int (*map)(u32 *addr, const u32 *range,
int na, int ns, int pna);
unsigned long (*get_flags)(const u32 *addr, unsigned long);
unsigned int (*get_flags)(const u32 *addr);
};

/*
Expand Down Expand Up @@ -130,10 +130,8 @@ static int of_bus_default_map(u32 *addr, const u32 *range,
return 0;
}

static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)
static unsigned int of_bus_default_get_flags(const u32 *addr)
{
if (flags)
return flags;
return IORESOURCE_MEM;
}

Expand Down Expand Up @@ -196,21 +194,17 @@ static int of_bus_pci_map(u32 *addr, const u32 *range,
return 0;
}

static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
static unsigned int of_bus_pci_get_flags(const u32 *addr)
{
unsigned int flags = 0;
u32 w = addr[0];

/* For PCI, we override whatever child busses may have used. */
flags = 0;
switch((w >> 24) & 0x03) {
case 0x01:
flags |= IORESOURCE_IO;
break;

case 0x02: /* 32 bits */
case 0x03: /* 64 bits */
flags |= IORESOURCE_MEM;
break;
}
if (w & 0x40000000)
flags |= IORESOURCE_PREFETCH;
Expand Down Expand Up @@ -368,11 +362,10 @@ static void __init build_device_resources(struct of_device *op,
int pna, pns;

size = of_read_addr(reg + na, ns);
flags = bus->get_flags(reg);

memcpy(addr, reg, na * 4);

flags = bus->get_flags(reg, 0);

/* If the immediate parent has no ranges property to apply,
* just use a 1<->1 mapping.
*/
Expand Down Expand Up @@ -400,8 +393,6 @@ static void __init build_device_resources(struct of_device *op,
dna, dns, pna))
break;

flags = pbus->get_flags(addr, flags);

dna = pna;
dns = pns;
dbus = pbus;
Expand Down
16 changes: 6 additions & 10 deletions trunk/arch/sparc/kernel/sun4d_smp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,8 @@ static struct smp_funcall {
static DEFINE_SPINLOCK(cross_call_lock);

/* Cross calls must be serialized, at least currently. */
static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
unsigned long arg2, unsigned long arg3,
unsigned long arg4)
void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,
unsigned long arg3, unsigned long arg4, unsigned long arg5)
{
if(smp_processors_ready) {
register int high = smp_highest_cpu;
Expand All @@ -279,7 +278,7 @@ static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
register unsigned long a2 asm("i2") = arg2;
register unsigned long a3 asm("i3") = arg3;
register unsigned long a4 asm("i4") = arg4;
register unsigned long a5 asm("i5") = 0;
register unsigned long a5 asm("i5") = arg5;

__asm__ __volatile__(
"std %0, [%6]\n\t"
Expand All @@ -291,10 +290,11 @@ static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,

/* Init receive/complete mapping, plus fire the IPI's off. */
{
cpumask_t mask;
register int i;

cpu_clear(smp_processor_id(), mask);
cpus_and(mask, cpu_online_map, mask);
mask = cpumask_of_cpu(hard_smp4d_processor_id());
cpus_andnot(mask, cpu_online_map, mask);
for(i = 0; i <= high; i++) {
if (cpu_isset(i, mask)) {
ccall_info.processors_in[i] = 0;
Expand All @@ -309,16 +309,12 @@ static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,

i = 0;
do {
if (!cpu_isset(i, mask))
continue;
while(!ccall_info.processors_in[i])
barrier();
} while(++i <= high);

i = 0;
do {
if (!cpu_isset(i, mask))
continue;
while(!ccall_info.processors_out[i])
barrier();
} while(++i <= high);
Expand Down
12 changes: 4 additions & 8 deletions trunk/arch/sparc/kernel/sun4m_smp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,9 @@ static struct smp_funcall {
static DEFINE_SPINLOCK(cross_call_lock);

/* Cross calls must be serialized, at least currently. */
static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
static void smp4m_cross_call(smpfunc_t func, unsigned long arg1,
unsigned long arg2, unsigned long arg3,
unsigned long arg4)
unsigned long arg4, unsigned long arg5)
{
register int ncpus = SUN4M_NCPUS;
unsigned long flags;
Expand All @@ -259,14 +259,14 @@ static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
ccall_info.arg2 = arg2;
ccall_info.arg3 = arg3;
ccall_info.arg4 = arg4;
ccall_info.arg5 = 0;
ccall_info.arg5 = arg5;

/* Init receive/complete mapping, plus fire the IPI's off. */
{
cpumask_t mask = cpu_online_map;
register int i;

cpu_clear(smp_processor_id(), mask);
cpus_and(mask, cpu_online_map, mask);
for(i = 0; i < ncpus; i++) {
if (cpu_isset(i, mask)) {
ccall_info.processors_in[i] = 0;
Expand All @@ -284,16 +284,12 @@ static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,

i = 0;
do {
if (!cpu_isset(i, mask))
continue;
while(!ccall_info.processors_in[i])
barrier();
} while(++i < ncpus);

i = 0;
do {
if (!cpu_isset(i, mask))
continue;
while(!ccall_info.processors_out[i])
barrier();
} while(++i < ncpus);
Expand Down
20 changes: 6 additions & 14 deletions trunk/arch/sparc64/kernel/of_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct of_bus {
int *addrc, int *sizec);
int (*map)(u32 *addr, const u32 *range,
int na, int ns, int pna);
unsigned long (*get_flags)(const u32 *addr, unsigned long);
unsigned int (*get_flags)(const u32 *addr);
};

/*
Expand Down Expand Up @@ -156,10 +156,8 @@ static int of_bus_default_map(u32 *addr, const u32 *range,
return 0;
}

static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)
static unsigned int of_bus_default_get_flags(const u32 *addr)
{
if (flags)
return flags;
return IORESOURCE_MEM;
}

Expand Down Expand Up @@ -251,21 +249,17 @@ static int of_bus_pci_map(u32 *addr, const u32 *range,
return 0;
}

static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
static unsigned int of_bus_pci_get_flags(const u32 *addr)
{
unsigned int flags = 0;
u32 w = addr[0];

/* For PCI, we override whatever child busses may have used. */
flags = 0;
switch((w >> 24) & 0x03) {
case 0x01:
flags |= IORESOURCE_IO;
break;

case 0x02: /* 32 bits */
case 0x03: /* 64 bits */
flags |= IORESOURCE_MEM;
break;
}
if (w & 0x40000000)
flags |= IORESOURCE_PREFETCH;
Expand Down Expand Up @@ -484,9 +478,9 @@ static void __init build_device_resources(struct of_device *op,
int pna, pns;

size = of_read_addr(reg + na, ns);
memcpy(addr, reg, na * 4);
flags = bus->get_flags(reg);

flags = bus->get_flags(addr, 0);
memcpy(addr, reg, na * 4);

if (use_1to1_mapping(pp)) {
result = of_read_addr(addr, na);
Expand All @@ -512,8 +506,6 @@ static void __init build_device_resources(struct of_device *op,
dna, dns, pna))
break;

flags = pbus->get_flags(addr, flags);

dna = pna;
dns = pns;
dbus = pbus;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sparc64/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1843,7 +1843,7 @@ static int pavail_rescan_ents __initdata;
* memory list again, and make sure it provides at least as much
* memory as 'pavail' does.
*/
static void __init setup_valid_addr_bitmap_from_pavail(void)
static void setup_valid_addr_bitmap_from_pavail(void)
{
int i;

Expand Down
9 changes: 6 additions & 3 deletions trunk/arch/x86/pci/i386.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
pr = pci_find_parent_resource(dev, r);
if (!r->start || !pr ||
request_resource(pr, r) < 0) {
dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);
dev_err(&dev->dev, "BAR %d: can't "
"allocate resource\n", idx);
/*
* Something is wrong with the region.
* Invalidate the resource to prevent
Expand Down Expand Up @@ -163,13 +164,15 @@ static void __init pcibios_allocate_resources(int pass)
else
disabled = !(command & PCI_COMMAND_MEMORY);
if (pass == disabled) {
dev_dbg(&dev->dev, "resource %#08llx-%#08llx (f=%lx, d=%d, p=%d)\n",
dev_dbg(&dev->dev, "resource %#08llx-%#08llx "
"(f=%lx, d=%d, p=%d)\n",
(unsigned long long) r->start,
(unsigned long long) r->end,
r->flags, disabled, pass);
pr = pci_find_parent_resource(dev, r);
if (!pr || request_resource(pr, r) < 0) {
dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);
dev_err(&dev->dev, "BAR %d: can't "
"allocate resource\n", idx);
/* We'll assign a new address later */
r->end -= r->start;
r->start = 0;
Expand Down
3 changes: 1 addition & 2 deletions trunk/block/cmd-filter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ int blk_register_filter(struct gendisk *disk)

return 0;
}
EXPORT_SYMBOL(blk_register_filter);

void blk_unregister_filter(struct gendisk *disk)
{
Expand All @@ -232,4 +231,4 @@ void blk_unregister_filter(struct gendisk *disk)
kobject_put(&filter->kobj);
kobject_put(disk->holder_dir->parent);
}
EXPORT_SYMBOL(blk_unregister_filter);

Loading

0 comments on commit 1304bb1

Please sign in to comment.