Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] IP27: Fix build errors if CONFIG_MAPPED_KERNEL=y [MIPS] Fix CMP Kconfig configuration and mark as broken.
This commit is contained in:
commit
ba9b0c1128
|
@ -211,6 +211,7 @@ config MIPS_MALTA
|
|||
select SYS_SUPPORTS_64BIT_KERNEL
|
||||
select SYS_SUPPORTS_BIG_ENDIAN
|
||||
select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||
select SYS_SUPPORTS_MIPS_CMP if BROKEN # because SYNC_R4K is broken
|
||||
select SYS_SUPPORTS_MULTITHREADING
|
||||
select SYS_SUPPORTS_SMARTMIPS
|
||||
help
|
||||
|
@ -1499,6 +1500,18 @@ config MIPS_APSP_KSPD
|
|||
"exit" syscall notifying other kernel modules the SP program is
|
||||
exiting. You probably want to say yes here.
|
||||
|
||||
config MIPS_CMP
|
||||
bool "MIPS CMP framework support"
|
||||
depends on SYS_SUPPORTS_MIPS_CMP
|
||||
select SYNC_R4K if BROKEN
|
||||
select SYS_SUPPORTS_SMP
|
||||
select SYS_SUPPORTS_SCHED_SMT if SMP
|
||||
select WEAK_ORDERING
|
||||
default n
|
||||
help
|
||||
This is a placeholder option for the GCMP work. It will need to
|
||||
be handled differently...
|
||||
|
||||
config SB1_PASS_1_WORKAROUNDS
|
||||
bool
|
||||
depends on CPU_SB1_PASS_1
|
||||
|
@ -1675,6 +1688,9 @@ config SMP
|
|||
config SMP_UP
|
||||
bool
|
||||
|
||||
config SYS_SUPPORTS_MIPS_CMP
|
||||
bool
|
||||
|
||||
config SYS_SUPPORTS_SMP
|
||||
bool
|
||||
|
||||
|
@ -1722,17 +1738,6 @@ config NR_CPUS
|
|||
performance should round up your number of processors to the next
|
||||
power of two.
|
||||
|
||||
config MIPS_CMP
|
||||
bool "MIPS CMP framework support"
|
||||
depends on SMP
|
||||
select SYNC_R4K
|
||||
select SYS_SUPPORTS_SCHED_SMT
|
||||
select WEAK_ORDERING
|
||||
default n
|
||||
help
|
||||
This is a placeholder option for the GCMP work. It will need to
|
||||
be handled differently...
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
#
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include <asm/irqflags.h>
|
||||
#include <asm/regdef.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/pgtable-bits.h>
|
||||
#include <asm/mipsregs.h>
|
||||
#include <asm/stackframe.h>
|
||||
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
#ifndef __ASM_SN_MAPPED_KERNEL_H
|
||||
#define __ASM_SN_MAPPED_KERNEL_H
|
||||
|
||||
#include <linux/mmzone.h>
|
||||
|
||||
/*
|
||||
* Note on how mapped kernels work: the text and data section is
|
||||
* compiled at cksseg segment (LOADADDR = 0xc001c000), and the
|
||||
|
@ -29,10 +31,8 @@
|
|||
#define MAPPED_ADDR_RO_TO_PHYS(x) (x - REP_BASE)
|
||||
#define MAPPED_ADDR_RW_TO_PHYS(x) (x - REP_BASE - 16777216)
|
||||
|
||||
#define MAPPED_KERN_RO_PHYSBASE(n) \
|
||||
(PLAT_NODE_DATA(n)->kern_vars.kv_ro_baseaddr)
|
||||
#define MAPPED_KERN_RW_PHYSBASE(n) \
|
||||
(PLAT_NODE_DATA(n)->kern_vars.kv_rw_baseaddr)
|
||||
#define MAPPED_KERN_RO_PHYSBASE(n) (hub_data(n)->kern_vars.kv_ro_baseaddr)
|
||||
#define MAPPED_KERN_RW_PHYSBASE(n) (hub_data(n)->kern_vars.kv_rw_baseaddr)
|
||||
|
||||
#define MAPPED_KERN_RO_TO_PHYS(x) \
|
||||
((unsigned long)MAPPED_ADDR_RO_TO_PHYS(x) | \
|
||||
|
|
Loading…
Reference in a new issue