提交 938b2b14 编写于 作者: T Thomas Bogendoerfer 提交者: Ralf Baechle

[MIPS] Malta: Fix build errors for 64-bit kernels

Fix 64-bit Malta by using CKSEG0ADDR and correct casts.
Signed-off-by: NThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
上级 1f34f2e4
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
int amon_cpu_avail(int cpu) int amon_cpu_avail(int cpu)
{ {
struct cpulaunch *launch = (struct cpulaunch *)KSEG0ADDR(CPULAUNCH); struct cpulaunch *launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH);
if (cpu < 0 || cpu >= NCPULAUNCH) { if (cpu < 0 || cpu >= NCPULAUNCH) {
pr_debug("avail: cpu%d is out of range\n", cpu); pr_debug("avail: cpu%d is out of range\n", cpu);
...@@ -53,7 +53,7 @@ void amon_cpu_start(int cpu, ...@@ -53,7 +53,7 @@ void amon_cpu_start(int cpu,
unsigned long gp, unsigned long a0) unsigned long gp, unsigned long a0)
{ {
volatile struct cpulaunch *launch = volatile struct cpulaunch *launch =
(struct cpulaunch *)KSEG0ADDR(CPULAUNCH); (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH);
if (!amon_cpu_avail(cpu)) if (!amon_cpu_avail(cpu))
return; return;
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#define MSK(n) ((1 << (n)) - 1) #define MSK(n) ((1 << (n)) - 1)
#define REG32(addr) (*(volatile unsigned int *) (addr)) #define REG32(addr) (*(volatile unsigned int *) (addr))
#define REG(base, offs) REG32((unsigned int)(base) + offs##_##OFS) #define REG(base, offs) REG32((unsigned long)(base) + offs##_##OFS)
#define REGP(base, phys) REG32((unsigned int)(base) + (phys)) #define REGP(base, phys) REG32((unsigned long)(base) + (phys))
/* Accessors */ /* Accessors */
#define GIC_REG(segment, offset) \ #define GIC_REG(segment, offset) \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册