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 'sound-fix-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[cascardo/linux.git]
/
drivers
/
irqchip
/
irq-gic.c
diff --git
a/drivers/irqchip/irq-gic.c
b/drivers/irqchip/irq-gic.c
index
f0a4800
..
38493ff
100644
(file)
--- a/
drivers/irqchip/irq-gic.c
+++ b/
drivers/irqchip/irq-gic.c
@@
-102,7
+102,7
@@
static struct gic_chip_data gic_data[MAX_GIC_NR] __read_mostly;
#ifdef CONFIG_GIC_NON_BANKED
static void __iomem *gic_get_percpu_base(union gic_base *base)
{
#ifdef CONFIG_GIC_NON_BANKED
static void __iomem *gic_get_percpu_base(union gic_base *base)
{
- return
*__this_cpu_ptr(
base->percpu_base);
+ return
raw_cpu_read(*
base->percpu_base);
}
static void __iomem *gic_get_common_base(union gic_base *base)
}
static void __iomem *gic_get_common_base(union gic_base *base)
@@
-522,11
+522,11
@@
static void gic_cpu_save(unsigned int gic_nr)
if (!dist_base || !cpu_base)
return;
if (!dist_base || !cpu_base)
return;
- ptr =
__this
_cpu_ptr(gic_data[gic_nr].saved_ppi_enable);
+ ptr =
raw
_cpu_ptr(gic_data[gic_nr].saved_ppi_enable);
for (i = 0; i < DIV_ROUND_UP(32, 32); i++)
ptr[i] = readl_relaxed(dist_base + GIC_DIST_ENABLE_SET + i * 4);
for (i = 0; i < DIV_ROUND_UP(32, 32); i++)
ptr[i] = readl_relaxed(dist_base + GIC_DIST_ENABLE_SET + i * 4);
- ptr =
__this
_cpu_ptr(gic_data[gic_nr].saved_ppi_conf);
+ ptr =
raw
_cpu_ptr(gic_data[gic_nr].saved_ppi_conf);
for (i = 0; i < DIV_ROUND_UP(32, 16); i++)
ptr[i] = readl_relaxed(dist_base + GIC_DIST_CONFIG + i * 4);
for (i = 0; i < DIV_ROUND_UP(32, 16); i++)
ptr[i] = readl_relaxed(dist_base + GIC_DIST_CONFIG + i * 4);
@@
-548,11
+548,11
@@
static void gic_cpu_restore(unsigned int gic_nr)
if (!dist_base || !cpu_base)
return;
if (!dist_base || !cpu_base)
return;
- ptr =
__this
_cpu_ptr(gic_data[gic_nr].saved_ppi_enable);
+ ptr =
raw
_cpu_ptr(gic_data[gic_nr].saved_ppi_enable);
for (i = 0; i < DIV_ROUND_UP(32, 32); i++)
writel_relaxed(ptr[i], dist_base + GIC_DIST_ENABLE_SET + i * 4);
for (i = 0; i < DIV_ROUND_UP(32, 32); i++)
writel_relaxed(ptr[i], dist_base + GIC_DIST_ENABLE_SET + i * 4);
- ptr =
__this
_cpu_ptr(gic_data[gic_nr].saved_ppi_conf);
+ ptr =
raw
_cpu_ptr(gic_data[gic_nr].saved_ppi_conf);
for (i = 0; i < DIV_ROUND_UP(32, 16); i++)
writel_relaxed(ptr[i], dist_base + GIC_DIST_CONFIG + i * 4);
for (i = 0; i < DIV_ROUND_UP(32, 16); i++)
writel_relaxed(ptr[i], dist_base + GIC_DIST_CONFIG + i * 4);