diff options
Diffstat (limited to 'arch/mips/pmc-sierra/yosemite')
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | 2 | ||||
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h | 1 | ||||
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/ht.c | 10 | ||||
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/smp.c | 8 |
4 files changed, 10 insertions, 11 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c index fc990cb3194..d6f8bdff8cb 100644 --- a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c +++ b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | |||
@@ -127,7 +127,7 @@ static int recv_ack(void) | |||
127 | 127 | ||
128 | if (ack) { | 128 | if (ack) { |
129 | do_idle(); | 129 | do_idle(); |
130 | printk(KERN_ERR "Error reading the Atmel 24C32/24C64 EEPROM \n"); | 130 | printk(KERN_ERR "Error reading the Atmel 24C32/24C64 EEPROM\n"); |
131 | return -1; | 131 | return -1; |
132 | } | 132 | } |
133 | 133 | ||
diff --git a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h index a31288335fb..d6c7ec469fa 100644 --- a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h +++ b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h | |||
@@ -65,4 +65,3 @@ | |||
65 | const char rts = TIOCM_RTS; | 65 | const char rts = TIOCM_RTS; |
66 | const char dtr = TIOCM_DTR; | 66 | const char dtr = TIOCM_DTR; |
67 | int fd; | 67 | int fd; |
68 | |||
diff --git a/arch/mips/pmc-sierra/yosemite/ht.c b/arch/mips/pmc-sierra/yosemite/ht.c index 678388fd34b..fd22597edb6 100644 --- a/arch/mips/pmc-sierra/yosemite/ht.c +++ b/arch/mips/pmc-sierra/yosemite/ht.c | |||
@@ -345,14 +345,13 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
345 | return pcibios_enable_resources(dev); | 345 | return pcibios_enable_resources(dev); |
346 | } | 346 | } |
347 | 347 | ||
348 | void pcibios_align_resource(void *data, struct resource *res, | 348 | resource_size_t pcibios_align_resource(void *data, const struct resource *res, |
349 | resource_size_t size, resource_size_t align) | 349 | resource_size_t size, resource_size_t align) |
350 | { | 350 | { |
351 | struct pci_dev *dev = data; | 351 | struct pci_dev *dev = data; |
352 | resource_size_t start = res->start; | ||
352 | 353 | ||
353 | if (res->flags & IORESOURCE_IO) { | 354 | if (res->flags & IORESOURCE_IO) { |
354 | resource_size_t start = res->start; | ||
355 | |||
356 | /* We need to avoid collisions with `mirrored' VGA ports | 355 | /* We need to avoid collisions with `mirrored' VGA ports |
357 | and other strange ISA hardware, so we always want the | 356 | and other strange ISA hardware, so we always want the |
358 | addresses kilobyte aligned. */ | 357 | addresses kilobyte aligned. */ |
@@ -363,8 +362,9 @@ void pcibios_align_resource(void *data, struct resource *res, | |||
363 | } | 362 | } |
364 | 363 | ||
365 | start = (start + 1024 - 1) & ~(1024 - 1); | 364 | start = (start + 1024 - 1) & ~(1024 - 1); |
366 | res->start = start; | ||
367 | } | 365 | } |
366 | |||
367 | return start; | ||
368 | } | 368 | } |
369 | 369 | ||
370 | struct pci_ops titan_pci_ops = { | 370 | struct pci_ops titan_pci_ops = { |
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c index 326fe7a392e..efc9e889b34 100644 --- a/arch/mips/pmc-sierra/yosemite/smp.c +++ b/arch/mips/pmc-sierra/yosemite/smp.c | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | #define LAUNCHSTACK_SIZE 256 | 9 | #define LAUNCHSTACK_SIZE 256 |
10 | 10 | ||
11 | static __cpuinitdata DEFINE_SPINLOCK(launch_lock); | 11 | static __cpuinitdata arch_spinlock_t launch_lock = __ARCH_SPIN_LOCK_UNLOCKED; |
12 | 12 | ||
13 | static unsigned long secondary_sp __cpuinitdata; | 13 | static unsigned long secondary_sp __cpuinitdata; |
14 | static unsigned long secondary_gp __cpuinitdata; | 14 | static unsigned long secondary_gp __cpuinitdata; |
@@ -20,7 +20,7 @@ static void __init prom_smp_bootstrap(void) | |||
20 | { | 20 | { |
21 | local_irq_disable(); | 21 | local_irq_disable(); |
22 | 22 | ||
23 | while (spin_is_locked(&launch_lock)); | 23 | while (arch_spin_is_locked(&launch_lock)); |
24 | 24 | ||
25 | __asm__ __volatile__( | 25 | __asm__ __volatile__( |
26 | " move $sp, %0 \n" | 26 | " move $sp, %0 \n" |
@@ -37,7 +37,7 @@ static void __init prom_smp_bootstrap(void) | |||
37 | */ | 37 | */ |
38 | void __init prom_grab_secondary(void) | 38 | void __init prom_grab_secondary(void) |
39 | { | 39 | { |
40 | spin_lock(&launch_lock); | 40 | arch_spin_lock(&launch_lock); |
41 | 41 | ||
42 | pmon_cpustart(1, &prom_smp_bootstrap, | 42 | pmon_cpustart(1, &prom_smp_bootstrap, |
43 | launchstack + LAUNCHSTACK_SIZE, 0); | 43 | launchstack + LAUNCHSTACK_SIZE, 0); |
@@ -138,7 +138,7 @@ static void __cpuinit yos_boot_secondary(int cpu, struct task_struct *idle) | |||
138 | secondary_sp = sp; | 138 | secondary_sp = sp; |
139 | secondary_gp = gp; | 139 | secondary_gp = gp; |
140 | 140 | ||
141 | spin_unlock(&launch_lock); | 141 | arch_spin_unlock(&launch_lock); |
142 | } | 142 | } |
143 | 143 | ||
144 | /* | 144 | /* |