Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
+21
-15
+16
-11
arch/mips/Kconfig
+16
-11
arch/mips/Kconfig
···
211
211
select SYS_SUPPORTS_64BIT_KERNEL
212
212
select SYS_SUPPORTS_BIG_ENDIAN
213
213
select SYS_SUPPORTS_LITTLE_ENDIAN
214
+
select SYS_SUPPORTS_MIPS_CMP if BROKEN # because SYNC_R4K is broken
214
215
select SYS_SUPPORTS_MULTITHREADING
215
216
select SYS_SUPPORTS_SMARTMIPS
216
217
help
···
1500
1499
"exit" syscall notifying other kernel modules the SP program is
1501
1500
exiting. You probably want to say yes here.
1502
1501
1502
+
config MIPS_CMP
1503
+
bool "MIPS CMP framework support"
1504
+
depends on SYS_SUPPORTS_MIPS_CMP
1505
+
select SYNC_R4K if BROKEN
1506
+
select SYS_SUPPORTS_SMP
1507
+
select SYS_SUPPORTS_SCHED_SMT if SMP
1508
+
select WEAK_ORDERING
1509
+
default n
1510
+
help
1511
+
This is a placeholder option for the GCMP work. It will need to
1512
+
be handled differently...
1513
+
1503
1514
config SB1_PASS_1_WORKAROUNDS
1504
1515
bool
1505
1516
depends on CPU_SB1_PASS_1
···
1688
1675
config SMP_UP
1689
1676
bool
1690
1677
1678
+
config SYS_SUPPORTS_MIPS_CMP
1679
+
bool
1680
+
1691
1681
config SYS_SUPPORTS_SMP
1692
1682
bool
1693
1683
···
1737
1721
approximately eight kilobytes to the kernel image. For best
1738
1722
performance should round up your number of processors to the next
1739
1723
power of two.
1740
-
1741
-
config MIPS_CMP
1742
-
bool "MIPS CMP framework support"
1743
-
depends on SMP
1744
-
select SYNC_R4K
1745
-
select SYS_SUPPORTS_SCHED_SMT
1746
-
select WEAK_ORDERING
1747
-
default n
1748
-
help
1749
-
This is a placeholder option for the GCMP work. It will need to
1750
-
be handled differently...
1751
1724
1752
1725
source "kernel/time/Kconfig"
1753
1726
+1
arch/mips/kernel/head.S
+1
arch/mips/kernel/head.S
+4
-4
include/asm-mips/sn/mapped_kernel.h
+4
-4
include/asm-mips/sn/mapped_kernel.h
···
5
5
#ifndef __ASM_SN_MAPPED_KERNEL_H
6
6
#define __ASM_SN_MAPPED_KERNEL_H
7
7
8
+
#include <linux/mmzone.h>
9
+
8
10
/*
9
11
* Note on how mapped kernels work: the text and data section is
10
12
* compiled at cksseg segment (LOADADDR = 0xc001c000), and the
···
31
29
#define MAPPED_ADDR_RO_TO_PHYS(x) (x - REP_BASE)
32
30
#define MAPPED_ADDR_RW_TO_PHYS(x) (x - REP_BASE - 16777216)
33
31
34
-
#define MAPPED_KERN_RO_PHYSBASE(n) \
35
-
(PLAT_NODE_DATA(n)->kern_vars.kv_ro_baseaddr)
36
-
#define MAPPED_KERN_RW_PHYSBASE(n) \
37
-
(PLAT_NODE_DATA(n)->kern_vars.kv_rw_baseaddr)
32
+
#define MAPPED_KERN_RO_PHYSBASE(n) (hub_data(n)->kern_vars.kv_ro_baseaddr)
33
+
#define MAPPED_KERN_RW_PHYSBASE(n) (hub_data(n)->kern_vars.kv_rw_baseaddr)
38
34
39
35
#define MAPPED_KERN_RO_TO_PHYS(x) \
40
36
((unsigned long)MAPPED_ADDR_RO_TO_PHYS(x) | \