projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
x86
/
platform
/
uv
/
uv_irq.c
diff --git
a/arch/x86/platform/uv/uv_irq.c
b/arch/x86/platform/uv/uv_irq.c
index
b233681
..
0ce6736
100644
(file)
--- a/
arch/x86/platform/uv/uv_irq.c
+++ b/
arch/x86/platform/uv/uv_irq.c
@@
-131,7
+131,7
@@
arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade,
unsigned long mmr_offset, int limit)
{
const struct cpumask *eligible_cpu = cpumask_of(cpu);
unsigned long mmr_offset, int limit)
{
const struct cpumask *eligible_cpu = cpumask_of(cpu);
- struct irq_cfg *cfg = irq_
get_chip_data
(irq);
+ struct irq_cfg *cfg = irq_
cfg
(irq);
unsigned long mmr_value;
struct uv_IO_APIC_route_entry *entry;
int mmr_pnode, err;
unsigned long mmr_value;
struct uv_IO_APIC_route_entry *entry;
int mmr_pnode, err;
@@
-198,13
+198,13
@@
static int
uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask,
bool force)
{
uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask,
bool force)
{
- struct irq_cfg *cfg =
data->chip_data
;
+ struct irq_cfg *cfg =
irqd_cfg(data)
;
unsigned int dest;
unsigned long mmr_value, mmr_offset;
struct uv_IO_APIC_route_entry *entry;
int mmr_pnode;
unsigned int dest;
unsigned long mmr_value, mmr_offset;
struct uv_IO_APIC_route_entry *entry;
int mmr_pnode;
- if (
__io
apic_set_affinity(data, mask, &dest))
+ if (apic_set_affinity(data, mask, &dest))
return -1;
mmr_value = 0;
return -1;
mmr_value = 0;