mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[PATCH] mips: clean up 32/64-bit configuration 

Start cleaning 32-bit vs. 64-bit configuration.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ralf Baechle 2005-09-03 15:56:16 -07:00 committed by Linus Torvalds
parent 63fb6fd1c8
commit 875d43e72b
110 changed files with 332 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
arch/mips/Kconfig
View File

@ -4,27 +4,38 @@ config MIPS
# Horrible source of confusion. Die, die, die ... # Horrible source of confusion. Die, die, die ...
select EMBEDDED select EMBEDDED
config MIPS64
bool "64-bit kernel"
help
Select this option if you want to build a 64-bit kernel. You should
only select this option if you have hardware that actually has a
64-bit processor and if your application will actually benefit from
64-bit processing, otherwise say N. You must say Y for kernels for
SGI IP27 (Origin 200 and 2000) and SGI IP32 (O2). If in doubt say N.
config 64BIT
def_bool MIPS64
config MIPS32
bool
depends on MIPS64 = 'n'
default y
mainmenu "Linux/MIPS Kernel Configuration" mainmenu "Linux/MIPS Kernel Configuration"
source "init/Kconfig" source "init/Kconfig"
menu "Kernel type"
choice
prompt "Kernel code model"
help
You should only select this option if you have a workload that
actually benefits from 64-bit processing or if your machine has
large memory. You will only be presented a single option in this
menu if your system does not support both 32-bit and 64-bit kernels.
config 32BIT
bool "32-bit kernel"
depends on CPU_SUPPORTS_32BIT_KERNEL && SYS_SUPPORTS_32BIT_KERNEL
select TRAD_SIGNALS
help
Select this option if you want to build a 32-bit kernel.
config 64BIT
bool "64-bit kernel"
depends on CPU_SUPPORTS_64BIT_KERNEL && SYS_SUPPORTS_64BIT_KERNEL
help
Select this option if you want to build a 64-bit kernel.
endchoice
endmenu
menu "Machine selection" menu "Machine selection"
config MACH_JAZZ config MACH_JAZZ
@ -155,7 +166,7 @@ config VRC4173
config TOSHIBA_JMR3927 config TOSHIBA_JMR3927
bool "Support for Toshiba JMR-TX3927 board" bool "Support for Toshiba JMR-TX3927 board"
depends on MIPS32 depends on 32BIT
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_PCI select HW_HAS_PCI
select SWAP_IO_SPACE select SWAP_IO_SPACE
@ -173,7 +184,7 @@ config MACH_DECSTATION
select BOOT_ELF32 select BOOT_ELF32
select DMA_NONCOHERENT select DMA_NONCOHERENT
select IRQ_CPU select IRQ_CPU
depends on MIPS32 || EXPERIMENTAL depends on 32BIT || EXPERIMENTAL
---help--- ---help---
This enables support for DEC's MIPS based workstations. For details This enables support for DEC's MIPS based workstations. For details
see the Linux/MIPS FAQ on <http://www.linux-mips.org/> and the see the Linux/MIPS FAQ on <http://www.linux-mips.org/> and the
@ -480,7 +491,7 @@ config SGI_IP22
config SGI_IP27 config SGI_IP27
bool "Support for SGI IP27 (Origin200/2000)" bool "Support for SGI IP27 (Origin200/2000)"
depends on MIPS64 depends on 64BIT
select ARC select ARC
select ARC64 select ARC64
select DMA_IP27 select DMA_IP27
@ -548,7 +559,7 @@ config REPLICATE_EXHANDLERS
config SGI_IP32 config SGI_IP32
bool "Support for SGI IP32 (O2) (EXPERIMENTAL)" bool "Support for SGI IP32 (O2) (EXPERIMENTAL)"
depends on MIPS64 && EXPERIMENTAL depends on 64BIT && EXPERIMENTAL
select ARC select ARC
select ARC32 select ARC32
select BOOT_ELF32 select BOOT_ELF32
@ -562,7 +573,7 @@ config SGI_IP32
If you want this kernel to run on SGI O2 workstation, say Y here. If you want this kernel to run on SGI O2 workstation, say Y here.
config SOC_AU1X00 config SOC_AU1X00
depends on MIPS32 depends on 32BIT
bool "Support for AMD/Alchemy Au1X00 SOCs" bool "Support for AMD/Alchemy Au1X00 SOCs"
choice choice
@ -902,7 +913,7 @@ config SNI_RM200_PCI
config TOSHIBA_RBTX4927 config TOSHIBA_RBTX4927
bool "Support for Toshiba TBTX49[23]7 board" bool "Support for Toshiba TBTX49[23]7 board"
depends on MIPS32 depends on 32BIT
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HAS_TXX9_SERIAL select HAS_TXX9_SERIAL
select HW_HAS_PCI select HW_HAS_PCI
@ -1171,7 +1182,7 @@ config CPU_R3000
config CPU_TX39XX config CPU_TX39XX
bool "R39XX" bool "R39XX"
depends on MIPS32 depends on 32BIT
config CPU_VR41XX config CPU_VR41XX
bool "R41xx" bool "R41xx"
@ -1205,7 +1216,7 @@ config CPU_R5432
config CPU_R6000 config CPU_R6000
bool "R6000" bool "R6000"
depends on MIPS32 && EXPERIMENTAL depends on 32BIT && EXPERIMENTAL
help help
MIPS Technologies R6000 and R6000A series processors. Note these MIPS Technologies R6000 and R6000A series processors. Note these
processors are extremly rare and the support for them is incomplete. processors are extremly rare and the support for them is incomplete.
@ -1217,7 +1228,7 @@ config CPU_NEVADA
config CPU_R8000 config CPU_R8000
bool "R8000" bool "R8000"
depends on MIPS64 && EXPERIMENTAL depends on 64BIT && EXPERIMENTAL
help help
MIPS Technologies R8000 processors. Note these processors are MIPS Technologies R8000 processors. Note these processors are
uncommon and the support for them is incomplete. uncommon and the support for them is incomplete.
@ -1330,11 +1341,11 @@ config SB1_PASS_2_1_WORKAROUNDS
config 64BIT_PHYS_ADDR config 64BIT_PHYS_ADDR
bool "Support for 64-bit physical address space" bool "Support for 64-bit physical address space"
depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && MIPS32 depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT
config CPU_ADVANCED config CPU_ADVANCED
bool "Override CPU Options" bool "Override CPU Options"
depends on MIPS32 depends on 32BIT
help help
Saying yes here allows you to select support for various features Saying yes here allows you to select support for various features
your CPU may or may not have. Most people should say N here. your CPU may or may not have. Most people should say N here.
@ -1388,7 +1399,7 @@ config CPU_HAS_SYNC
# #
config HIGHMEM config HIGHMEM
bool "High Memory Support" bool "High Memory Support"
depends on MIPS32 && (CPU_R3000 || CPU_SB1 || CPU_R7000 || CPU_RM9000 || CPU_R10000) && !(MACH_DECSTATION || MOMENCO_JAGUAR_ATX) depends on 32BIT && (CPU_R3000 || CPU_SB1 || CPU_R7000 || CPU_RM9000 || CPU_R10000) && !(MACH_DECSTATION || MOMENCO_JAGUAR_ATX)
config ARCH_FLATMEM_ENABLE config ARCH_FLATMEM_ENABLE
def_bool y def_bool y
@ -1448,7 +1459,7 @@ config RTC_DS1742
config MIPS_INSANE_LARGE config MIPS_INSANE_LARGE
bool "Support for large 64-bit configurations" bool "Support for large 64-bit configurations"
depends on CPU_R10000 && MIPS64 depends on CPU_R10000 && 64BIT
help help
MIPS R10000 does support a 44 bit / 16TB address space as opposed to MIPS R10000 does support a 44 bit / 16TB address space as opposed to
previous 64-bit processors which only supported 40 bit / 1TB. If you previous 64-bit processors which only supported 40 bit / 1TB. If you
@ -1549,11 +1560,11 @@ source "fs/Kconfig.binfmt"
config TRAD_SIGNALS config TRAD_SIGNALS
bool bool
default y if MIPS32 default y if 32BIT
config BUILD_ELF64 config BUILD_ELF64
bool "Use 64-bit ELF format for building" bool "Use 64-bit ELF format for building"
depends on MIPS64 depends on 64BIT
help help
A 64-bit kernel is usually built using the 64-bit ELF binary object A 64-bit kernel is usually built using the 64-bit ELF binary object
format as it's one that allows arbitrary 64-bit constructs. For format as it's one that allows arbitrary 64-bit constructs. For
@ -1568,11 +1579,11 @@ config BUILD_ELF64
config BINFMT_IRIX config BINFMT_IRIX
bool "Include IRIX binary compatibility" bool "Include IRIX binary compatibility"
depends on !CPU_LITTLE_ENDIAN && MIPS32 && BROKEN depends on !CPU_LITTLE_ENDIAN && 32BIT && BROKEN
config MIPS32_COMPAT config MIPS32_COMPAT
bool "Kernel support for Linux/MIPS 32-bit binary compatibility" bool "Kernel support for Linux/MIPS 32-bit binary compatibility"
depends on MIPS64 depends on 64BIT
help help
Select this option if you want Linux/MIPS 32-bit binary Select this option if you want Linux/MIPS 32-bit binary
compatibility. Since all software available for Linux/MIPS is compatibility. Since all software available for Linux/MIPS is

16
arch/mips/Makefile
View File

@ -37,12 +37,12 @@ else
64bit-emul = elf64btsmip 64bit-emul = elf64btsmip
endif endif
ifdef CONFIG_MIPS32 ifdef CONFIG_32BIT
gcc-abi = 32 gcc-abi = 32
tool-prefix = $(32bit-tool-prefix) tool-prefix = $(32bit-tool-prefix)
UTS_MACHINE := mips UTS_MACHINE := mips
endif endif
ifdef CONFIG_MIPS64 ifdef CONFIG_64BIT
gcc-abi = 64 gcc-abi = 64
tool-prefix = $(64bit-tool-prefix) tool-prefix = $(64bit-tool-prefix)
UTS_MACHINE := mips64 UTS_MACHINE := mips64
@ -63,7 +63,7 @@ ld-emul = $(32bit-emul)
vmlinux-32 = vmlinux vmlinux-32 = vmlinux
vmlinux-64 = vmlinux.64 vmlinux-64 = vmlinux.64
cflags-$(CONFIG_MIPS64) += $(call cc-option,-mno-explicit-relocs) cflags-$(CONFIG_64BIT) += $(call cc-option,-mno-explicit-relocs)
endif endif
# #
@ -524,10 +524,10 @@ load-$(CONFIG_TANBAC_TB022X) += 0xffffffff80000000
# #
core-$(CONFIG_SGI_IP22) += arch/mips/sgi-ip22/ core-$(CONFIG_SGI_IP22) += arch/mips/sgi-ip22/
cflags-$(CONFIG_SGI_IP22) += -Iinclude/asm-mips/mach-ip22 cflags-$(CONFIG_SGI_IP22) += -Iinclude/asm-mips/mach-ip22
ifdef CONFIG_MIPS32 ifdef CONFIG_32BIT
load-$(CONFIG_SGI_IP22) += 0xffffffff88002000 load-$(CONFIG_SGI_IP22) += 0xffffffff88002000
endif endif
ifdef CONFIG_MIPS64 ifdef CONFIG_64BIT
load-$(CONFIG_SGI_IP22) += 0xffffffff88004000 load-$(CONFIG_SGI_IP22) += 0xffffffff88004000
endif endif
@ -632,7 +632,7 @@ load-$(CONFIG_TOSHIBA_RBTX4927) += 0xffffffff80020000
cflags-y += -Iinclude/asm-mips/mach-generic cflags-y += -Iinclude/asm-mips/mach-generic
drivers-$(CONFIG_PCI) += arch/mips/pci/ drivers-$(CONFIG_PCI) += arch/mips/pci/
ifdef CONFIG_MIPS32 ifdef CONFIG_32BIT
ifdef CONFIG_CPU_LITTLE_ENDIAN ifdef CONFIG_CPU_LITTLE_ENDIAN
JIFFIES = jiffies_64 JIFFIES = jiffies_64
else else
@ -664,8 +664,8 @@ CPPFLAGS_vmlinux.lds := \
head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
libs-y += arch/mips/lib/ libs-y += arch/mips/lib/
libs-$(CONFIG_MIPS32) += arch/mips/lib-32/ libs-$(CONFIG_32BIT) += arch/mips/lib-32/
libs-$(CONFIG_MIPS64) += arch/mips/lib-64/ libs-$(CONFIG_64BIT) += arch/mips/lib-64/
core-y += arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/ core-y += arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/

4
arch/mips/configs/atlas_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:00 2005 # Wed Jan 26 02:49:00 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/capcella_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:00 2005 # Wed Jan 26 02:49:00 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/cobalt_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:00 2005 # Wed Jan 26 02:49:00 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/db1000_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:01 2005 # Wed Jan 26 02:49:01 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/db1100_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:01 2005 # Wed Jan 26 02:49:01 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/db1500_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:01 2005 # Wed Jan 26 02:49:01 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/db1550_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:02 2005 # Wed Jan 26 02:49:02 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/ddb5476_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:02 2005 # Wed Jan 26 02:49:02 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/ddb5477_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:02 2005 # Wed Jan 26 02:49:02 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/decstation_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:03 2005 # Wed Jan 26 02:49:03 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/e55_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:03 2005 # Wed Jan 26 02:49:03 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/ev64120_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:03 2005 # Wed Jan 26 02:49:03 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/ev96100_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:03 2005 # Wed Jan 26 02:49:03 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/ip22_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:04 2005 # Wed Jan 26 02:49:04 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

2
arch/mips/configs/ip27_defconfig
View File

@ -4,7 +4,7 @@
# Wed Jan 26 02:49:04 2005 # Wed Jan 26 02:49:04 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
CONFIG_MIPS64=y CONFIG_64BIT=y
CONFIG_64BIT=y CONFIG_64BIT=y
# #

2
arch/mips/configs/ip32_defconfig
View File

@ -4,7 +4,7 @@
# Wed Jan 26 02:49:04 2005 # Wed Jan 26 02:49:04 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
CONFIG_MIPS64=y CONFIG_64BIT=y
CONFIG_64BIT=y CONFIG_64BIT=y
# #

4
arch/mips/configs/it8172_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:05 2005 # Wed Jan 26 02:49:05 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/ivr_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:05 2005 # Wed Jan 26 02:49:05 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/jaguar-atx_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:05 2005 # Wed Jan 26 02:49:05 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/jmr3927_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:06 2005 # Wed Jan 26 02:49:06 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/lasat200_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:06 2005 # Wed Jan 26 02:49:06 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/malta_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:53:14 2005 # Wed Jan 26 02:53:14 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/mpc30x_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:07 2005 # Wed Jan 26 02:49:07 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/ocelot_3_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:07 2005 # Wed Jan 26 02:49:07 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

2
arch/mips/configs/ocelot_c_defconfig
View File

@ -4,7 +4,7 @@
# Wed Jan 26 02:49:07 2005 # Wed Jan 26 02:49:07 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
CONFIG_MIPS64=y CONFIG_64BIT=y
CONFIG_64BIT=y CONFIG_64BIT=y
# #

4
arch/mips/configs/ocelot_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:08 2005 # Wed Jan 26 02:49:08 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

2
arch/mips/configs/ocelot_g_defconfig
View File

@ -4,7 +4,7 @@
# Wed Jan 26 02:49:08 2005 # Wed Jan 26 02:49:08 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
CONFIG_MIPS64=y CONFIG_64BIT=y
CONFIG_64BIT=y CONFIG_64BIT=y
# #

4
arch/mips/configs/pb1100_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:08 2005 # Wed Jan 26 02:49:08 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/pb1500_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:09 2005 # Wed Jan 26 02:49:09 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/pb1550_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:09 2005 # Wed Jan 26 02:49:09 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/rm200_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:09 2005 # Wed Jan 26 02:49:09 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/sb1250-swarm_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:10 2005 # Wed Jan 26 02:49:10 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/sead_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:10 2005 # Wed Jan 26 02:49:10 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/tb0226_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:12 2005 # Wed Jan 26 02:49:12 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/tb0229_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:12 2005 # Wed Jan 26 02:49:12 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/workpad_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:12 2005 # Wed Jan 26 02:49:12 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

4
arch/mips/configs/yosemite_defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:49:13 2005 # Wed Jan 26 02:49:13 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

6
arch/mips/dec/int-handler.S
View File

@ -133,7 +133,7 @@
*/ */
mfc0 t0,CP0_CAUSE # get pending interrupts mfc0 t0,CP0_CAUSE # get pending interrupts
mfc0 t1,CP0_STATUS mfc0 t1,CP0_STATUS
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
lw t2,cpu_fpu_mask lw t2,cpu_fpu_mask
#endif #endif
andi t0,ST0_IM # CAUSE.CE may be non-zero! andi t0,ST0_IM # CAUSE.CE may be non-zero!
@ -141,7 +141,7 @@
beqz t0,spurious beqz t0,spurious
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
and t2,t0 and t2,t0
bnez t2,fpu # handle FPU immediately bnez t2,fpu # handle FPU immediately
#endif #endif
@ -271,7 +271,7 @@ handle_it:
j ret_from_irq j ret_from_irq
nop nop
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
fpu: fpu:
j handle_fpe_int j handle_fpe_int
nop nop

4
arch/mips/dec/prom/Makefile
View File

@ -5,7 +5,7 @@
lib-y += init.o memory.o cmdline.o identify.o console.o lib-y += init.o memory.o cmdline.o identify.o console.o
lib-$(CONFIG_MIPS32) += locore.o lib-$(CONFIG_32BIT) += locore.o
lib-$(CONFIG_MIPS64) += call_o32.o lib-$(CONFIG_64BIT) += call_o32.o
EXTRA_AFLAGS := $(CFLAGS) EXTRA_AFLAGS := $(CFLAGS)

4
arch/mips/defconfig
View File

@ -4,9 +4,9 @@
# Wed Jan 26 02:48:59 2005 # Wed Jan 26 02:48:59 2005
# #
CONFIG_MIPS=y CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_MIPS32=y # CONFIG_64BIT is not set
CONFIG_32BIT=y
# #
# Code maturity level options # Code maturity level options

10
arch/mips/kernel/Makefile
View File

@ -13,8 +13,8 @@ binfmt_irix-objs := irixelf.o irixinv.o irixioctl.o irixsig.o \
ifdef CONFIG_MODULES ifdef CONFIG_MODULES
obj-y += mips_ksyms.o module.o obj-y += mips_ksyms.o module.o
obj-$(CONFIG_MIPS32) += module-elf32.o obj-$(CONFIG_32BIT) += module-elf32.o
obj-$(CONFIG_MIPS64) += module-elf64.o obj-$(CONFIG_64BIT) += module-elf64.o
endif endif
obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o
@ -45,8 +45,8 @@ obj-$(CONFIG_IRQ_CPU_RM7K) += irq-rm7000.o
obj-$(CONFIG_IRQ_CPU_RM9K) += irq-rm9000.o obj-$(CONFIG_IRQ_CPU_RM9K) += irq-rm9000.o
obj-$(CONFIG_IRQ_MV64340) += irq-mv6434x.o obj-$(CONFIG_IRQ_MV64340) += irq-mv6434x.o
obj-$(CONFIG_MIPS32) += scall32-o32.o obj-$(CONFIG_32BIT) += scall32-o32.o
obj-$(CONFIG_MIPS64) += scall64-64.o obj-$(CONFIG_64BIT) += scall64-64.o
obj-$(CONFIG_BINFMT_IRIX) += binfmt_irix.o obj-$(CONFIG_BINFMT_IRIX) += binfmt_irix.o
obj-$(CONFIG_MIPS32_COMPAT) += ioctl32.o linux32.o signal32.o obj-$(CONFIG_MIPS32_COMPAT) += ioctl32.o linux32.o signal32.o
obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o
@ -55,7 +55,7 @@ obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o ptrace32.o
obj-$(CONFIG_KGDB) += gdb-low.o gdb-stub.o obj-$(CONFIG_KGDB) += gdb-low.o gdb-stub.o
obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_PROC_FS) += proc.o
obj-$(CONFIG_MIPS64) += cpu-bugs64.o obj-$(CONFIG_64BIT) += cpu-bugs64.o
obj-$(CONFIG_GEN_RTC) += genrtc.o obj-$(CONFIG_GEN_RTC) += genrtc.o

4
arch/mips/kernel/gdb-low.S
View File

@ -13,13 +13,13 @@
#include <asm/stackframe.h> #include <asm/stackframe.h>
#include <asm/gdb-stub.h> #include <asm/gdb-stub.h>
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#define DMFC0 mfc0 #define DMFC0 mfc0
#define DMTC0 mtc0 #define DMTC0 mtc0
#define LDC1 lwc1 #define LDC1 lwc1
#define SDC1 lwc1 #define SDC1 lwc1
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define DMFC0 dmfc0 #define DMFC0 dmfc0
#define DMTC0 dmtc0 #define DMTC0 dmtc0
#define LDC1 ldc1 #define LDC1 ldc1

10
arch/mips/kernel/genex.S
View File

@ -54,7 +54,7 @@ NESTED(except_vec3_generic, 0, sp)
#endif #endif
mfc0 k1, CP0_CAUSE mfc0 k1, CP0_CAUSE
andi k1, k1, 0x7c andi k1, k1, 0x7c
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
dsll k1, k1, 1 dsll k1, k1, 1
#endif #endif
PTR_L k0, exception_handlers(k1) PTR_L k0, exception_handlers(k1)
@ -81,7 +81,7 @@ NESTED(except_vec3_r4000, 0, sp)
beq k1, k0, handle_vced beq k1, k0, handle_vced
li k0, 14<<2 li k0, 14<<2
beq k1, k0, handle_vcei beq k1, k0, handle_vcei
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
dsll k1, k1, 1 dsll k1, k1, 1
#endif #endif
.set pop .set pop
@ -244,10 +244,10 @@ NESTED(nmi_handler, PT_SIZE, sp)
start with an n and gas will believe \n is ok ... */ start with an n and gas will believe \n is ok ... */
.macro __BUILD_verbose nexception .macro __BUILD_verbose nexception
LONG_L a1, PT_EPC(sp) LONG_L a1, PT_EPC(sp)
#if CONFIG_MIPS32 #if CONFIG_32BIT
PRINT("Got \nexception at %08lx\012") PRINT("Got \nexception at %08lx\012")
#endif #endif
#if CONFIG_MIPS64 #if CONFIG_64BIT
PRINT("Got \nexception at %016lx\012") PRINT("Got \nexception at %016lx\012")
#endif #endif
.endm .endm
@ -293,7 +293,7 @@ NESTED(nmi_handler, PT_SIZE, sp)
BUILD_HANDLER mcheck mcheck cli verbose /* #24 */ BUILD_HANDLER mcheck mcheck cli verbose /* #24 */
BUILD_HANDLER reserved reserved sti verbose /* others */ BUILD_HANDLER reserved reserved sti verbose /* others */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* A temporary overflow handler used by check_daddi(). */ /* A temporary overflow handler used by check_daddi(). */
__INIT __INIT

6
arch/mips/kernel/head.S
View File

@ -107,7 +107,7 @@
.endm .endm
.macro setup_c0_status_pri .macro setup_c0_status_pri
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
setup_c0_status ST0_KX 0 setup_c0_status ST0_KX 0
#else #else
setup_c0_status 0 0 setup_c0_status 0 0
@ -115,7 +115,7 @@
.endm .endm
.macro setup_c0_status_sec .macro setup_c0_status_sec
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
setup_c0_status ST0_KX ST0_BEV setup_c0_status ST0_KX ST0_BEV
#else #else
setup_c0_status 0 ST0_BEV setup_c0_status 0 ST0_BEV
@ -215,7 +215,7 @@ NESTED(smp_bootstrap, 16, sp)
* slightly different layout ... * slightly different layout ...
*/ */
page swapper_pg_dir, _PGD_ORDER page swapper_pg_dir, _PGD_ORDER
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
page invalid_pmd_table, _PMD_ORDER page invalid_pmd_table, _PMD_ORDER
#endif #endif
page invalid_pte_table, _PTE_ORDER page invalid_pte_table, _PTE_ORDER

2
arch/mips/kernel/mips_ksyms.c
View File

@ -35,7 +35,7 @@ EXPORT_SYMBOL(memcpy);
EXPORT_SYMBOL(memmove); EXPORT_SYMBOL(memmove);
EXPORT_SYMBOL(strcat); EXPORT_SYMBOL(strcat);
EXPORT_SYMBOL(strchr); EXPORT_SYMBOL(strchr);
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
EXPORT_SYMBOL(strncmp); EXPORT_SYMBOL(strncmp);
#endif #endif
EXPORT_SYMBOL(strlen); EXPORT_SYMBOL(strlen);

8
arch/mips/kernel/process.c
View File

@ -70,7 +70,7 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
/* New thread loses kernel privileges. */ /* New thread loses kernel privileges. */
status = regs->cp0_status & ~(ST0_CU0|ST0_CU1|KU_MASK); status = regs->cp0_status & ~(ST0_CU0|ST0_CU1|KU_MASK);
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
status &= ~ST0_FR; status &= ~ST0_FR;
status |= (current->thread.mflags & MF_32BIT_REGS) ? 0 : ST0_FR; status |= (current->thread.mflags & MF_32BIT_REGS) ? 0 : ST0_FR;
#endif #endif
@ -236,10 +236,10 @@ static int __init get_frame_info(struct mips_frame_info *info, void *func)
break; break;
if ( if (
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
ip->i_format.opcode == sw_op && ip->i_format.opcode == sw_op &&
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
ip->i_format.opcode == sd_op && ip->i_format.opcode == sd_op &&
#endif #endif
ip->i_format.rs == 29) ip->i_format.rs == 29)
@ -353,7 +353,7 @@ schedule_timeout_caller:
out: out:
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
if (current->thread.mflags & MF_32BIT_REGS) /* Kludge for 32-bit ps */ if (current->thread.mflags & MF_32BIT_REGS) /* Kludge for 32-bit ps */
pc &= 0xffffffffUL; pc &= 0xffffffffUL;
#endif #endif

12
arch/mips/kernel/ptrace.c
View File

@ -124,7 +124,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
if (tsk_used_math(child)) { if (tsk_used_math(child)) {
fpureg_t *fregs = get_fpu_regs(child); fpureg_t *fregs = get_fpu_regs(child);
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
/* /*
* The odd registers are actually the high * The odd registers are actually the high
* order bits of the values stored in the even * order bits of the values stored in the even
@ -135,7 +135,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
else else
tmp = (unsigned long) (fregs[(addr - 32)] & 0xffffffff); tmp = (unsigned long) (fregs[(addr - 32)] & 0xffffffff);
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
tmp = fregs[addr - FPR_BASE]; tmp = fregs[addr - FPR_BASE];
#endif #endif
} else { } else {
@ -213,7 +213,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
sizeof(child->thread.fpu.hard)); sizeof(child->thread.fpu.hard));
child->thread.fpu.hard.fcr31 = 0; child->thread.fpu.hard.fcr31 = 0;
} }
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
/* /*
* The odd registers are actually the high order bits * The odd registers are actually the high order bits
* of the values stored in the even registers - unless * of the values stored in the even registers - unless
@ -227,7 +227,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
fregs[addr - FPR_BASE] |= data; fregs[addr - FPR_BASE] |= data;
} }
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
fregs[addr - FPR_BASE] = data; fregs[addr - FPR_BASE] = data;
#endif #endif
break; break;
@ -304,14 +304,14 @@ out:
static inline int audit_arch(void) static inline int audit_arch(void)
{ {
#ifdef CONFIG_CPU_LITTLE_ENDIAN #ifdef CONFIG_CPU_LITTLE_ENDIAN
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
if (!(current->thread.mflags & MF_32BIT_REGS)) if (!(current->thread.mflags & MF_32BIT_REGS))
return AUDIT_ARCH_MIPSEL64; return AUDIT_ARCH_MIPSEL64;
#endif /* MIPS64 */ #endif /* MIPS64 */
return AUDIT_ARCH_MIPSEL; return AUDIT_ARCH_MIPSEL;
#else /* big endian... */ #else /* big endian... */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
if (!(current->thread.mflags & MF_32BIT_REGS)) if (!(current->thread.mflags & MF_32BIT_REGS))
return AUDIT_ARCH_MIPS64; return AUDIT_ARCH_MIPS64;
#endif /* MIPS64 */ #endif /* MIPS64 */

4
arch/mips/kernel/r4k_fpu.S
View File

@ -36,7 +36,7 @@
LEAF(_save_fp_context) LEAF(_save_fp_context)
cfc1 t1, fcr31 cfc1 t1, fcr31
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* Store the 16 odd double precision registers */ /* Store the 16 odd double precision registers */
EX sdc1 $f1, SC_FPREGS+8(a0) EX sdc1 $f1, SC_FPREGS+8(a0)
EX sdc1 $f3, SC_FPREGS+24(a0) EX sdc1 $f3, SC_FPREGS+24(a0)
@ -118,7 +118,7 @@ LEAF(_save_fp_context32)
*/ */
LEAF(_restore_fp_context) LEAF(_restore_fp_context)
EX lw t0, SC_FPC_CSR(a0) EX lw t0, SC_FPC_CSR(a0)
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
EX ldc1 $f1, SC_FPREGS+8(a0) EX ldc1 $f1, SC_FPREGS+8(a0)
EX ldc1 $f3, SC_FPREGS+24(a0) EX ldc1 $f3, SC_FPREGS+24(a0)
EX ldc1 $f5, SC_FPREGS+40(a0) EX ldc1 $f5, SC_FPREGS+40(a0)

4
arch/mips/kernel/r4k_switch.S
View File

@ -105,7 +105,7 @@
* Save a thread's fp context. * Save a thread's fp context.
*/ */
LEAF(_save_fp) LEAF(_save_fp)
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
mfc0 t1, CP0_STATUS mfc0 t1, CP0_STATUS
#endif #endif
fpu_save_double a0 t1 t0 t2 # clobbers t1 fpu_save_double a0 t1 t0 t2 # clobbers t1
@ -142,7 +142,7 @@ LEAF(_init_fpu)
li t1, -1 # SNaN li t1, -1 # SNaN
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
sll t0, t0, 5 sll t0, t0, 5
bgez t0, 1f # 16 / 32 register mode? bgez t0, 1f # 16 / 32 register mode?

4
arch/mips/kernel/setup.c
View File

@ -241,7 +241,7 @@ static inline int parse_rd_cmdline(unsigned long* rd_start, unsigned long* rd_en
if (*tmp) if (*tmp)
strcat(command_line, tmp); strcat(command_line, tmp);
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* HACK: Guess if the sign extension was forgotten */ /* HACK: Guess if the sign extension was forgotten */
if (start > 0x0000000080000000 && start < 0x00000000ffffffff) if (start > 0x0000000080000000 && start < 0x00000000ffffffff)
start |= 0xffffffff00000000; start |= 0xffffffff00000000;
@ -446,7 +446,7 @@ static inline void resource_init(void)
{ {
int i; int i;
#if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64) #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
/* /*
* The 64bit code in 32bit object format trick can't represent * The 64bit code in 32bit object format trick can't represent
* 64bit wide relocations for linker script symbols. * 64bit wide relocations for linker script symbols.

2
arch/mips/kernel/traps.c
View File

@ -924,7 +924,7 @@ void __init per_cpu_trap_init(void)
* flag that some firmware may have left set and the TS bit (for * flag that some firmware may have left set and the TS bit (for
* IP27). Set XX for ISA IV code to work. * IP27). Set XX for ISA IV code to work.
*/ */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
status_set |= ST0_FR|ST0_KX|ST0_SX|ST0_UX; status_set |= ST0_FR|ST0_KX|ST0_SX|ST0_UX;
#endif #endif
if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV) if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV)

12
arch/mips/kernel/unaligned.c
View File

@ -240,7 +240,7 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
break; break;
case lwu_op: case lwu_op:
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* /*
* A 32-bit kernel might be running on a 64-bit processor. But * A 32-bit kernel might be running on a 64-bit processor. But
* if we're on a 32-bit processor and an i-cache incoherency * if we're on a 32-bit processor and an i-cache incoherency
@ -278,13 +278,13 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
*newvalue = value; *newvalue = value;
*regptr = &regs->regs[insn.i_format.rt]; *regptr = &regs->regs[insn.i_format.rt];
break; break;
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
/* Cannot handle 64-bit instructions in 32-bit kernel */ /* Cannot handle 64-bit instructions in 32-bit kernel */
goto sigill; goto sigill;
case ld_op: case ld_op:
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* /*
* A 32-bit kernel might be running on a 64-bit processor. But * A 32-bit kernel might be running on a 64-bit processor. But
* if we're on a 32-bit processor and an i-cache incoherency * if we're on a 32-bit processor and an i-cache incoherency
@ -320,7 +320,7 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
*newvalue = value; *newvalue = value;
*regptr = &regs->regs[insn.i_format.rt]; *regptr = &regs->regs[insn.i_format.rt];
break; break;
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
/* Cannot handle 64-bit instructions in 32-bit kernel */ /* Cannot handle 64-bit instructions in 32-bit kernel */
goto sigill; goto sigill;
@ -392,7 +392,7 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
break; break;
case sd_op: case sd_op:
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* /*
* A 32-bit kernel might be running on a 64-bit processor. But * A 32-bit kernel might be running on a 64-bit processor. But
* if we're on a 32-bit processor and an i-cache incoherency * if we're on a 32-bit processor and an i-cache incoherency
@ -428,7 +428,7 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
if (res) if (res)
goto fault; goto fault;
break; break;
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
/* Cannot handle 64-bit instructions in 32-bit kernel */ /* Cannot handle 64-bit instructions in 32-bit kernel */
goto sigill; goto sigill;

2
arch/mips/lib/memcpy.S
View File

@ -79,7 +79,7 @@
/* /*
* Only on the 64-bit kernel we can made use of 64-bit registers. * Only on the 64-bit kernel we can made use of 64-bit registers.
*/ */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define USE_DOUBLE #define USE_DOUBLE
#endif #endif

2
arch/mips/math-emu/kernel_linkage.c
View File

@ -86,7 +86,7 @@ int fpu_emulator_restore_context(struct sigcontext *sc)
return err; return err;
} }
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* /*
* This is the o32 version * This is the o32 version
*/ */

4
arch/mips/mm/Makefile
View File

@ -5,8 +5,8 @@
obj-y += cache.o extable.o fault.o init.o pgtable.o \ obj-y += cache.o extable.o fault.o init.o pgtable.o \
tlbex.o tlbex-fault.o tlbex.o tlbex-fault.o
obj-$(CONFIG_MIPS32) += ioremap.o pgtable-32.o obj-$(CONFIG_32BIT) += ioremap.o pgtable-32.o
obj-$(CONFIG_MIPS64) += pgtable-64.o obj-$(CONFIG_64BIT) += pgtable-64.o
obj-$(CONFIG_HIGHMEM) += highmem.o obj-$(CONFIG_HIGHMEM) += highmem.o
obj-$(CONFIG_CPU_MIPS32) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o obj-$(CONFIG_CPU_MIPS32) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o

4
arch/mips/mm/c-r4k.c
View File

@ -723,10 +723,10 @@ static void local_r4k_flush_cache_sigtramp(void * arg)
".set push\n\t" ".set push\n\t"
".set noat\n\t" ".set noat\n\t"
".set mips3\n\t" ".set mips3\n\t"
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
"la $at,1f\n\t" "la $at,1f\n\t"
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
"dla $at,1f\n\t" "dla $at,1f\n\t"
#endif #endif
"cache %0,($at)\n\t" "cache %0,($at)\n\t"

8
arch/mips/mm/init.c
View File

@ -96,7 +96,7 @@ static void __init kmap_init(void)
kmap_prot = PAGE_KERNEL; kmap_prot = PAGE_KERNEL;
} }
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
static void __init fixrange_init(unsigned long start, unsigned long end, static void __init fixrange_init(unsigned long start, unsigned long end,
pgd_t *pgd_base) pgd_t *pgd_base)
{ {
@ -125,7 +125,7 @@ static void __init fixrange_init(unsigned long start, unsigned long end,
j = 0; j = 0;
} }
} }
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
#endif /* CONFIG_HIGHMEM */ #endif /* CONFIG_HIGHMEM */
#ifndef CONFIG_NEED_MULTIPLE_NODES #ifndef CONFIG_NEED_MULTIPLE_NODES
@ -258,7 +258,7 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* Switch from KSEG0 to XKPHYS addresses */ /* Switch from KSEG0 to XKPHYS addresses */
start = (unsigned long)phys_to_virt(CPHYSADDR(start)); start = (unsigned long)phys_to_virt(CPHYSADDR(start));
end = (unsigned long)phys_to_virt(CPHYSADDR(end)); end = (unsigned long)phys_to_virt(CPHYSADDR(end));
@ -286,7 +286,7 @@ void free_initmem(void)
addr = (unsigned long) &__init_begin; addr = (unsigned long) &__init_begin;
while (addr < (unsigned long) &__init_end) { while (addr < (unsigned long) &__init_end) {
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
page = PAGE_OFFSET | CPHYSADDR(addr); page = PAGE_OFFSET | CPHYSADDR(addr);
#else #else
page = addr; page = addr;

8
arch/mips/mm/pg-sb1.c
View File

@ -114,7 +114,7 @@ static inline void copy_page_cpu(void *to, void *from)
" pref " SB1_PREF_STORE_STREAMED_HINT ", -64(%1)\n" " pref " SB1_PREF_STORE_STREAMED_HINT ", -64(%1)\n"
" pref " SB1_PREF_LOAD_STREAMED_HINT ", -32(%0)\n" " pref " SB1_PREF_LOAD_STREAMED_HINT ", -32(%0)\n"
"1: pref " SB1_PREF_STORE_STREAMED_HINT ", -32(%1)\n" "1: pref " SB1_PREF_STORE_STREAMED_HINT ", -32(%1)\n"
# ifdef CONFIG_MIPS64 # ifdef CONFIG_64BIT
" ld $8, -128(%0) \n" /* Block copy a cacheline */ " ld $8, -128(%0) \n" /* Block copy a cacheline */
" ld $9, -120(%0) \n" " ld $9, -120(%0) \n"
" ld $10, -112(%0) \n" " ld $10, -112(%0) \n"
@ -148,7 +148,7 @@ static inline void copy_page_cpu(void *to, void *from)
" daddiu %0, %0, -128 \n" " daddiu %0, %0, -128 \n"
" daddiu %1, %1, -128 \n" " daddiu %1, %1, -128 \n"
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
" ld $8, 0(%0) \n" /* Block copy a cacheline */ " ld $8, 0(%0) \n" /* Block copy a cacheline */
"1: ld $9, 8(%0) \n" "1: ld $9, 8(%0) \n"
" ld $10, 16(%0) \n" " ld $10, 16(%0) \n"
@ -178,7 +178,7 @@ static inline void copy_page_cpu(void *to, void *from)
" daddiu %0, %0, 32 \n" " daddiu %0, %0, 32 \n"
" daddiu %1, %1, 32 \n" " daddiu %1, %1, 32 \n"
" bnel %0, %2, 1b \n" " bnel %0, %2, 1b \n"
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
" ld $8, 0(%0) \n" " ld $8, 0(%0) \n"
#else #else
" lw $2, 0(%0) \n" " lw $2, 0(%0) \n"
@ -186,7 +186,7 @@ static inline void copy_page_cpu(void *to, void *from)
" .set pop \n" " .set pop \n"
: "+r" (src), "+r" (dst) : "+r" (src), "+r" (dst)
: "r" (end) : "r" (end)
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
: "$8","$9","$10","$11","memory"); : "$8","$9","$10","$11","memory");
#else #else
: "$2","$3","$6","$7","$8","$9","$10","$11","memory"); : "$2","$3","$6","$7","$8","$9","$10","$11","memory");

30
arch/mips/mm/tlbex.c
View File

@ -448,7 +448,7 @@ L_LA(_r3000_write_probe_fail)
L_LA(_r3000_write_probe_ok) L_LA(_r3000_write_probe_ok)
/* convenience macros for instructions */ /* convenience macros for instructions */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
# define i_LW(buf, rs, rt, off) i_ld(buf, rs, rt, off) # define i_LW(buf, rs, rt, off) i_ld(buf, rs, rt, off)
# define i_SW(buf, rs, rt, off) i_sd(buf, rs, rt, off) # define i_SW(buf, rs, rt, off) i_sd(buf, rs, rt, off)
# define i_SLL(buf, rs, rt, sh) i_dsll(buf, rs, rt, sh) # define i_SLL(buf, rs, rt, sh) i_dsll(buf, rs, rt, sh)
@ -486,7 +486,7 @@ L_LA(_r3000_write_probe_ok)
#define i_ssnop(buf) i_sll(buf, 0, 0, 1) #define i_ssnop(buf) i_sll(buf, 0, 0, 1)
#define i_ehb(buf) i_sll(buf, 0, 0, 3) #define i_ehb(buf) i_sll(buf, 0, 0, 3)
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
static __init int __attribute__((unused)) in_compat_space_p(long addr) static __init int __attribute__((unused)) in_compat_space_p(long addr)
{ {
/* Is this address in 32bit compat space? */ /* Is this address in 32bit compat space? */
@ -516,7 +516,7 @@ static __init int rel_lo(long val)
static __init void i_LA_mostly(u32 **buf, unsigned int rs, long addr) static __init void i_LA_mostly(u32 **buf, unsigned int rs, long addr)
{ {
#if CONFIG_MIPS64 #if CONFIG_64BIT
if (!in_compat_space_p(addr)) { if (!in_compat_space_p(addr)) {
i_lui(buf, rs, rel_highest(addr)); i_lui(buf, rs, rel_highest(addr));
if (rel_higher(addr)) if (rel_higher(addr))
@ -682,7 +682,7 @@ static void il_bgezl(u32 **p, struct reloc **r, unsigned int reg,
#define C0_EPC 14 #define C0_EPC 14
#define C0_XCONTEXT 20 #define C0_XCONTEXT 20
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
# define GET_CONTEXT(buf, reg) i_MFC0(buf, reg, C0_XCONTEXT) # define GET_CONTEXT(buf, reg) i_MFC0(buf, reg, C0_XCONTEXT)
#else #else
# define GET_CONTEXT(buf, reg) i_MFC0(buf, reg, C0_CONTEXT) # define GET_CONTEXT(buf, reg) i_MFC0(buf, reg, C0_CONTEXT)
@ -923,7 +923,7 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l,
} }
} }
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* /*
* TMP and PTR are scratch. * TMP and PTR are scratch.
* TMP will be clobbered, PTR will hold the pmd entry. * TMP will be clobbered, PTR will hold the pmd entry.
@ -1010,7 +1010,7 @@ build_get_pgd_vmalloc64(u32 **p, struct label **l, struct reloc **r,
} }
} }
#else /* !CONFIG_MIPS64 */ #else /* !CONFIG_64BIT */
/* /*
* TMP and PTR are scratch. * TMP and PTR are scratch.
@ -1038,7 +1038,7 @@ build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr)
i_addu(p, ptr, ptr, tmp); /* add in pgd offset */ i_addu(p, ptr, ptr, tmp); /* add in pgd offset */
} }
#endif /* !CONFIG_MIPS64 */ #endif /* !CONFIG_64BIT */
static __init void build_adjust_context(u32 **p, unsigned int ctx) static __init void build_adjust_context(u32 **p, unsigned int ctx)
{ {
@ -1159,7 +1159,7 @@ static void __init build_r4000_tlb_refill_handler(void)
/* No need for i_nop */ /* No need for i_nop */
} }
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
#else #else
build_get_pgde32(&p, K0, K1); /* get pgd in K1 */ build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
@ -1171,7 +1171,7 @@ static void __init build_r4000_tlb_refill_handler(void)
l_leave(&l, p); l_leave(&l, p);
i_eret(&p); /* return from trap */ i_eret(&p); /* return from trap */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
build_get_pgd_vmalloc64(&p, &l, &r, K0, K1); build_get_pgd_vmalloc64(&p, &l, &r, K0, K1);
#endif #endif
@ -1182,7 +1182,7 @@ static void __init build_r4000_tlb_refill_handler(void)
* need three, with the the second nop'ed and the third being * need three, with the the second nop'ed and the third being
* unused. * unused.
*/ */
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
if ((p - tlb_handler) > 64) if ((p - tlb_handler) > 64)
panic("TLB refill handler space exceeded"); panic("TLB refill handler space exceeded");
#else #else
@ -1195,12 +1195,12 @@ static void __init build_r4000_tlb_refill_handler(void)
/* /*
* Now fold the handler in the TLB refill handler space. * Now fold the handler in the TLB refill handler space.
*/ */
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
f = final_handler; f = final_handler;
/* Simplest case, just copy the handler. */ /* Simplest case, just copy the handler. */
copy_handler(relocs, labels, tlb_handler, p, f); copy_handler(relocs, labels, tlb_handler, p, f);
final_len = p - tlb_handler; final_len = p - tlb_handler;
#else /* CONFIG_MIPS64 */ #else /* CONFIG_64BIT */
f = final_handler + 32; f = final_handler + 32;
if ((p - tlb_handler) <= 32) { if ((p - tlb_handler) <= 32) {
/* Just copy the handler. */ /* Just copy the handler. */
@ -1235,7 +1235,7 @@ static void __init build_r4000_tlb_refill_handler(void)
copy_handler(relocs, labels, split, p, final_handler); copy_handler(relocs, labels, split, p, final_handler);
final_len = (f - (final_handler + 32)) + (p - split); final_len = (f - (final_handler + 32)) + (p - split);
} }
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
resolve_relocs(relocs, labels); resolve_relocs(relocs, labels);
printk("Synthesized TLB refill handler (%u instructions).\n", printk("Synthesized TLB refill handler (%u instructions).\n",
@ -1605,7 +1605,7 @@ build_r4000_tlbchange_handler_head(u32 **p, struct label **l,
struct reloc **r, unsigned int pte, struct reloc **r, unsigned int pte,
unsigned int ptr) unsigned int ptr)
{ {
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */ build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */
#else #else
build_get_pgde32(p, pte, ptr); /* get pgd in ptr */ build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
@ -1636,7 +1636,7 @@ build_r4000_tlbchange_handler_tail(u32 **p, struct label **l,
l_leave(l, *p); l_leave(l, *p);
i_eret(p); /* return from trap */ i_eret(p); /* return from trap */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
build_get_pgd_vmalloc64(p, l, r, tmp, ptr); build_get_pgd_vmalloc64(p, l, r, tmp, ptr);
#endif #endif
} }

10
arch/mips/momentum/jaguar_atx/prom.c
View File

@ -90,7 +90,7 @@ void get_mac(char dest[6])
} }
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
unsigned long signext(unsigned long addr) unsigned long signext(unsigned long addr)
{ {
@ -143,7 +143,7 @@ char *arg64(unsigned long addrin, int arg_index)
return p; return p;
} }
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
/* PMON passes arguments in C main() style */ /* PMON passes arguments in C main() style */
void __init prom_init(void) void __init prom_init(void)
@ -158,7 +158,7 @@ void __init prom_init(void)
// ja_setup_console(); /* The very first thing. */ // ja_setup_console(); /* The very first thing. */
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
char *ptr; char *ptr;
printk("Mips64 Jaguar-ATX\n"); printk("Mips64 Jaguar-ATX\n");
@ -201,7 +201,7 @@ void __init prom_init(void)
} }
printk("arcs_cmdline: %s\n", arcs_cmdline); printk("arcs_cmdline: %s\n", arcs_cmdline);
#else /* CONFIG_MIPS64 */ #else /* CONFIG_64BIT */
/* save the PROM vectors for debugging use */ /* save the PROM vectors for debugging use */
debug_vectors = cv; debug_vectors = cv;
@ -226,7 +226,7 @@ void __init prom_init(void)
} }
env++; env++;
} }
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
mips_machgroup = MACH_GROUP_MOMENCO; mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_JAGUAR_ATX; mips_machtype = MACH_MOMENCO_JAGUAR_ATX;

2
arch/mips/momentum/jaguar_atx/reset.c
View File

@ -27,7 +27,7 @@
void momenco_jaguar_restart(char *command) void momenco_jaguar_restart(char *command)
{ {
/* base address of timekeeper portion of part */ /* base address of timekeeper portion of part */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
void *nvram = (void*) 0xfffffffffc807000; void *nvram = (void*) 0xfffffffffc807000;
#else #else
void *nvram = (void*) 0xfc807000; void *nvram = (void*) 0xfc807000;

2
arch/mips/momentum/jaguar_atx/setup.c
View File

@ -105,7 +105,7 @@ void __init bus_error_init(void) { /* nothing */ }
static __init void wire_stupidity_into_tlb(void) static __init void wire_stupidity_into_tlb(void)
{ {
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
write_c0_wired(0); write_c0_wired(0);
local_flush_tlb_all(); local_flush_tlb_all();

12
arch/mips/momentum/ocelot_3/prom.c
View File

@ -93,7 +93,7 @@ void get_mac(char dest[6])
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
unsigned long signext(unsigned long addr) unsigned long signext(unsigned long addr)
{ {
@ -145,7 +145,7 @@ char *arg64(unsigned long addrin, int arg_index)
return p; return p;
} }
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
void __init prom_init(void) void __init prom_init(void)
{ {
@ -155,7 +155,7 @@ void __init prom_init(void)
struct callvectors *cv = (struct callvectors *) fw_arg3; struct callvectors *cv = (struct callvectors *) fw_arg3;
int i; int i;
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
char *ptr; char *ptr;
printk("prom_init - MIPS64\n"); printk("prom_init - MIPS64\n");
@ -198,7 +198,7 @@ void __init prom_init(void)
} }
printk("arcs_cmdline: %s\n", arcs_cmdline); printk("arcs_cmdline: %s\n", arcs_cmdline);
#else /* CONFIG_MIPS64 */ #else /* CONFIG_64BIT */
/* save the PROM vectors for debugging use */ /* save the PROM vectors for debugging use */
debug_vectors = cv; debug_vectors = cv;
@ -224,7 +224,7 @@ void __init prom_init(void)
} }
env++; env++;
} }
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
mips_machgroup = MACH_GROUP_MOMENCO; mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_3; mips_machtype = MACH_MOMENCO_OCELOT_3;
@ -234,7 +234,7 @@ void __init prom_init(void)
get_mac(prom_mac_addr_base); get_mac(prom_mac_addr_base);
#endif #endif
#ifndef CONFIG_MIPS64 #ifndef CONFIG_64BIT
debug_vectors->printf("Booting Linux kernel...\n"); debug_vectors->printf("Booting Linux kernel...\n");
#endif #endif
} }

2
arch/mips/momentum/ocelot_c/ocelot_c_fpga.h
View File

@ -32,7 +32,7 @@
#include <linux/config.h> #include <linux/config.h>
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define OCELOT_C_CS0_ADDR (0xfffffffffc000000) #define OCELOT_C_CS0_ADDR (0xfffffffffc000000)
#else #else
#define OCELOT_C_CS0_ADDR (0xfc000000) #define OCELOT_C_CS0_ADDR (0xfc000000)

12
arch/mips/momentum/ocelot_c/prom.c
View File

@ -94,7 +94,7 @@ void get_mac(char dest[6])
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
unsigned long signext(unsigned long addr) unsigned long signext(unsigned long addr)
{ {
@ -144,7 +144,7 @@ char *arg64(unsigned long addrin, int arg_index)
p = (char *)get_arg(args, arg_index); p = (char *)get_arg(args, arg_index);
return p; return p;
} }
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
void __init prom_init(void) void __init prom_init(void)
@ -155,7 +155,7 @@ void __init prom_init(void)
struct callvectors *cv = (struct callvectors *) fw_arg3; struct callvectors *cv = (struct callvectors *) fw_arg3;
int i; int i;
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
char *ptr; char *ptr;
printk("prom_init - MIPS64\n"); printk("prom_init - MIPS64\n");
@ -197,7 +197,7 @@ void __init prom_init(void)
} }
printk("arcs_cmdline: %s\n", arcs_cmdline); printk("arcs_cmdline: %s\n", arcs_cmdline);
#else /* CONFIG_MIPS64 */ #else /* CONFIG_64BIT */
/* save the PROM vectors for debugging use */ /* save the PROM vectors for debugging use */
debug_vectors = cv; debug_vectors = cv;
@ -222,7 +222,7 @@ void __init prom_init(void)
} }
env++; env++;
} }
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
mips_machgroup = MACH_GROUP_MOMENCO; mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_C; mips_machtype = MACH_MOMENCO_OCELOT_C;
@ -232,7 +232,7 @@ void __init prom_init(void)
get_mac(prom_mac_addr_base); get_mac(prom_mac_addr_base);
#endif #endif
#ifndef CONFIG_MIPS64 #ifndef CONFIG_64BIT
debug_vectors->printf("Booting Linux kernel...\n"); debug_vectors->printf("Booting Linux kernel...\n");
#endif #endif
} }

2
arch/mips/momentum/ocelot_c/reset.c
View File

@ -28,7 +28,7 @@ void momenco_ocelot_restart(char *command)
{ {
/* base address of timekeeper portion of part */ /* base address of timekeeper portion of part */
void *nvram = (void *) void *nvram = (void *)
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
0xfffffffffc807000; 0xfffffffffc807000;
#else #else
0xfc807000; 0xfc807000;

8
arch/mips/momentum/ocelot_c/setup.c
View File

@ -109,7 +109,7 @@ void PMON_v2_setup(void)
*/ */
printk("PMON_v2_setup\n"); printk("PMON_v2_setup\n");
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* marvell and extra space */ /* marvell and extra space */
add_wired_entry(ENTRYLO(0xf4000000), ENTRYLO(0xf4010000), 0xfffffffff4000000, PM_64K); add_wired_entry(ENTRYLO(0xf4000000), ENTRYLO(0xf4010000), 0xfffffffff4000000, PM_64K);
/* fpga, rtc, and uart */ /* fpga, rtc, and uart */
@ -134,7 +134,7 @@ void PMON_v2_setup(void)
unsigned long m48t37y_get_time(void) unsigned long m48t37y_get_time(void)
{ {
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
unsigned char *rtc_base = (unsigned char*)0xfffffffffc800000; unsigned char *rtc_base = (unsigned char*)0xfffffffffc800000;
#else #else
unsigned char* rtc_base = (unsigned char*)0xfc800000; unsigned char* rtc_base = (unsigned char*)0xfc800000;
@ -163,7 +163,7 @@ unsigned long m48t37y_get_time(void)
int m48t37y_set_time(unsigned long sec) int m48t37y_set_time(unsigned long sec)
{ {
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
unsigned char* rtc_base = (unsigned char*)0xfffffffffc800000; unsigned char* rtc_base = (unsigned char*)0xfffffffffc800000;
#else #else
unsigned char* rtc_base = (unsigned char*)0xfc800000; unsigned char* rtc_base = (unsigned char*)0xfc800000;
@ -342,7 +342,7 @@ static void __init momenco_ocelot_c_setup(void)
early_initcall(momenco_ocelot_c_setup); early_initcall(momenco_ocelot_c_setup);
#ifndef CONFIG_MIPS64 #ifndef CONFIG_64BIT
/* This needs to be one of the first initcalls, because no I/O port access /* This needs to be one of the first initcalls, because no I/O port access
can work before this */ can work before this */
static int io_base_ioremap(void) static int io_base_ioremap(void)

2
arch/mips/pci/pci-ip32.c
View File

@ -84,7 +84,7 @@ static irqreturn_t macepci_error(int irq, void *dev, struct pt_regs *regs)
extern struct pci_ops mace_pci_ops; extern struct pci_ops mace_pci_ops;
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
static struct resource mace_pci_mem_resource = { static struct resource mace_pci_mem_resource = {
.name = "SGI O2 PCI MEM", .name = "SGI O2 PCI MEM",
.start = MACEPCI_HI_MEMORY, .start = MACEPCI_HI_MEMORY,

2
arch/mips/sibyte/cfe/setup.c
View File

@ -33,7 +33,7 @@
#include "cfe_error.h" #include "cfe_error.h"
/* Max ram addressable in 32-bit segments */ /* Max ram addressable in 32-bit segments */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define MAX_RAM_SIZE (~0ULL) #define MAX_RAM_SIZE (~0ULL)
#else #else
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM

2
arch/mips/sibyte/swarm/setup.c
View File

@ -73,7 +73,7 @@ int swarm_be_handler(struct pt_regs *regs, int is_fixup)
{ {
if (!is_fixup && (regs->cp0_cause & 4)) { if (!is_fixup && (regs->cp0_cause & 4)) {
/* Data bus error - print PA */ /* Data bus error - print PA */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
printk("DBE physical address: %010lx\n", printk("DBE physical address: %010lx\n",
__read_64bit_c0_register($26, 1)); __read_64bit_c0_register($26, 1));
#else #else

2
drivers/block/Kconfig
View File

@ -455,7 +455,7 @@ config INITRAMFS_ROOT_GID
#for instance. #for instance.
config LBD config LBD
bool "Support for Large Block Devices" bool "Support for Large Block Devices"
depends on X86 || MIPS32 || PPC32 || ARCH_S390_31 || SUPERH || UML depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
help help
Say Y here if you want to attach large (bigger than 2TB) discs to Say Y here if you want to attach large (bigger than 2TB) discs to
your machine, or if you want to have a raid or loopback device your machine, or if you want to have a raid or loopback device

2
drivers/scsi/Kconfig
View File

@ -250,7 +250,7 @@ config SCSI_DECNCR
config SCSI_DECSII config SCSI_DECSII
tristate "DEC SII Scsi Driver" tristate "DEC SII Scsi Driver"
depends on MACH_DECSTATION && SCSI && MIPS32 depends on MACH_DECSTATION && SCSI && 32BIT
config BLK_DEV_3W_XXXX_RAID config BLK_DEV_3W_XXXX_RAID
tristate "3ware 5/6/7/8xxx ATA-RAID support" tristate "3ware 5/6/7/8xxx ATA-RAID support"

2
drivers/serial/Kconfig
View File

@ -308,7 +308,7 @@ config SERIAL_S3C2410_CONSOLE
config SERIAL_DZ config SERIAL_DZ
bool "DECstation DZ serial driver" bool "DECstation DZ serial driver"
depends on MACH_DECSTATION && MIPS32 depends on MACH_DECSTATION && 32BIT
select SERIAL_CORE select SERIAL_CORE
help help
DZ11-family serial controllers for VAXstations, including the DZ11-family serial controllers for VAXstations, including the

4
include/asm-mips/a.out.h
View File

@ -35,10 +35,10 @@ struct exec
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#define STACK_TOP TASK_SIZE #define STACK_TOP TASK_SIZE
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define STACK_TOP (current->thread.mflags & MF_32BIT_ADDR ? TASK_SIZE32 : TASK_SIZE) #define STACK_TOP (current->thread.mflags & MF_32BIT_ADDR ? TASK_SIZE32 : TASK_SIZE)
#endif #endif

2
include/asm-mips/addrspace.h
View File

@ -48,7 +48,7 @@
#define CPHYSADDR(a) ((_ACAST32_ (a)) & 0x1fffffff) #define CPHYSADDR(a) ((_ACAST32_ (a)) & 0x1fffffff)
#define XPHYSADDR(a) ((_ACAST64_ (a)) & 0x000000ffffffffff) #define XPHYSADDR(a) ((_ACAST64_ (a)) & 0x000000ffffffffff)
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* /*
* Memory segments (64bit kernel mode addresses) * Memory segments (64bit kernel mode addresses)

4
include/asm-mips/asmmacro.h
View File

@ -11,10 +11,10 @@
#include <linux/config.h> #include <linux/config.h>
#include <asm/hazards.h> #include <asm/hazards.h>
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#include <asm/asmmacro-32.h> #include <asm/asmmacro-32.h>
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#include <asm/asmmacro-64.h> #include <asm/asmmacro-64.h>
#endif #endif

4
include/asm-mips/atomic.h
View File

@ -334,7 +334,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
*/ */
#define atomic_add_negative(i,v) (atomic_add_return(i, (v)) < 0) #define atomic_add_negative(i,v) (atomic_add_return(i, (v)) < 0)
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
typedef struct { volatile __s64 counter; } atomic64_t; typedef struct { volatile __s64 counter; } atomic64_t;
@ -639,7 +639,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
*/ */
#define atomic64_add_negative(i,v) (atomic64_add_return(i, (v)) < 0) #define atomic64_add_negative(i,v) (atomic64_add_return(i, (v)) < 0)
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
/* /*
* atomic*_return operations are serializing but not the non-*_return * atomic*_return operations are serializing but not the non-*_return

8
include/asm-mips/bitops.h
View File

@ -533,14 +533,14 @@ static inline unsigned long ffz(unsigned long word)
int b = 0, s; int b = 0, s;
word = ~word; word = ~word;
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
s = 16; if (word << 16 != 0) s = 0; b += s; word >>= s; s = 16; if (word << 16 != 0) s = 0; b += s; word >>= s;
s = 8; if (word << 24 != 0) s = 0; b += s; word >>= s; s = 8; if (word << 24 != 0) s = 0; b += s; word >>= s;
s = 4; if (word << 28 != 0) s = 0; b += s; word >>= s; s = 4; if (word << 28 != 0) s = 0; b += s; word >>= s;
s = 2; if (word << 30 != 0) s = 0; b += s; word >>= s; s = 2; if (word << 30 != 0) s = 0; b += s; word >>= s;
s = 1; if (word << 31 != 0) s = 0; b += s; s = 1; if (word << 31 != 0) s = 0; b += s;
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
s = 32; if (word << 32 != 0) s = 0; b += s; word >>= s; s = 32; if (word << 32 != 0) s = 0; b += s; word >>= s;
s = 16; if (word << 48 != 0) s = 0; b += s; word >>= s; s = 16; if (word << 48 != 0) s = 0; b += s; word >>= s;
s = 8; if (word << 56 != 0) s = 0; b += s; word >>= s; s = 8; if (word << 56 != 0) s = 0; b += s; word >>= s;
@ -683,7 +683,7 @@ found_middle:
*/ */
static inline int sched_find_first_bit(const unsigned long *b) static inline int sched_find_first_bit(const unsigned long *b)
{ {
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
if (unlikely(b[0])) if (unlikely(b[0]))
return __ffs(b[0]); return __ffs(b[0]);
if (unlikely(b[1])) if (unlikely(b[1]))
@ -694,7 +694,7 @@ static inline int sched_find_first_bit(const unsigned long *b)
return __ffs(b[3]) + 96; return __ffs(b[3]) + 96;
return __ffs(b[4]) + 128; return __ffs(b[4]) + 128;
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
if (unlikely(b[0])) if (unlikely(b[0]))
return __ffs(b[0]); return __ffs(b[0]);
if (unlikely(b[1])) if (unlikely(b[1]))

2
include/asm-mips/bugs.h
View File

@ -15,7 +15,7 @@ extern void check_bugs64(void);
static inline void check_bugs(void) static inline void check_bugs(void)
{ {
check_bugs32(); check_bugs32();
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
check_bugs64(); check_bugs64();
#endif #endif
} }

4
include/asm-mips/checksum.h
View File

@ -128,7 +128,7 @@ static inline unsigned int csum_tcpudp_nofold(unsigned long saddr,
{ {
__asm__( __asm__(
".set\tnoat\t\t\t# csum_tcpudp_nofold\n\t" ".set\tnoat\t\t\t# csum_tcpudp_nofold\n\t"
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
"addu\t%0, %2\n\t" "addu\t%0, %2\n\t"
"sltu\t$1, %0, %2\n\t" "sltu\t$1, %0, %2\n\t"
"addu\t%0, $1\n\t" "addu\t%0, $1\n\t"
@ -141,7 +141,7 @@ static inline unsigned int csum_tcpudp_nofold(unsigned long saddr,
"sltu\t$1, %0, %4\n\t" "sltu\t$1, %0, %4\n\t"
"addu\t%0, $1\n\t" "addu\t%0, $1\n\t"
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
"daddu\t%0, %2\n\t" "daddu\t%0, %2\n\t"
"daddu\t%0, %3\n\t" "daddu\t%0, %3\n\t"
"daddu\t%0, %4\n\t" "daddu\t%0, %4\n\t"

4
include/asm-mips/cpu-features.h
View File

@ -106,7 +106,7 @@
#define PLAT_TRAMPOLINE_STUFF_LINE 0UL #define PLAT_TRAMPOLINE_STUFF_LINE 0UL
#endif #endif
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
# ifndef cpu_has_nofpuex # ifndef cpu_has_nofpuex
# define cpu_has_nofpuex (cpu_data[0].options & MIPS_CPU_NOFPUEX) # define cpu_has_nofpuex (cpu_data[0].options & MIPS_CPU_NOFPUEX)
# endif # endif
@ -124,7 +124,7 @@
# endif # endif
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
# ifndef cpu_has_nofpuex # ifndef cpu_has_nofpuex
# define cpu_has_nofpuex 0 # define cpu_has_nofpuex 0
# endif # endif

12
include/asm-mips/dec/prom.h
View File

@ -48,15 +48,15 @@
*/ */
#define REX_PROM_MAGIC 0x30464354 #define REX_PROM_MAGIC 0x30464354
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define prom_is_rex(magic) 1 /* KN04 and KN05 are REX PROMs. */ #define prom_is_rex(magic) 1 /* KN04 and KN05 are REX PROMs. */
#else /* !CONFIG_MIPS64 */ #else /* !CONFIG_64BIT */
#define prom_is_rex(magic) ((magic) == REX_PROM_MAGIC) #define prom_is_rex(magic) ((magic) == REX_PROM_MAGIC)
#endif /* !CONFIG_MIPS64 */ #endif /* !CONFIG_64BIT */
/* /*
@ -105,7 +105,7 @@ extern int (*__pmax_read)(int, void *, int);
extern int (*__pmax_close)(int); extern int (*__pmax_close)(int);
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* /*
* On MIPS64 we have to call PROM functions via a helper * On MIPS64 we have to call PROM functions via a helper
@ -138,7 +138,7 @@ int _prom_printf(int (*)(char *, ...), char *, ...) __DEC_PROM_O32;
#define prom_getenv(x) _prom_getenv(__prom_getenv, x) #define prom_getenv(x) _prom_getenv(__prom_getenv, x)
#define prom_printf(x...) _prom_printf(__prom_printf, x) #define prom_printf(x...) _prom_printf(__prom_printf, x)
#else /* !CONFIG_MIPS64 */ #else /* !CONFIG_64BIT */
/* /*
* On plain MIPS we just call PROM functions directly. * On plain MIPS we just call PROM functions directly.
@ -160,7 +160,7 @@ int _prom_printf(int (*)(char *, ...), char *, ...) __DEC_PROM_O32;
#define pmax_read __pmax_read #define pmax_read __pmax_read
#define pmax_close __pmax_close #define pmax_close __pmax_close
#endif /* !CONFIG_MIPS64 */ #endif /* !CONFIG_64BIT */
extern void prom_meminit(u32); extern void prom_meminit(u32);

6
include/asm-mips/delay.h
View File

@ -57,11 +57,11 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj)
* The common rates of 1000 and 128 are rounded wrongly by the * The common rates of 1000 and 128 are rounded wrongly by the
* catchall case for 64-bit. Excessive precission? Probably ... * catchall case for 64-bit. Excessive precission? Probably ...
*/ */
#if defined(CONFIG_MIPS64) && (HZ == 128) #if defined(CONFIG_64BIT) && (HZ == 128)
usecs *= 0x0008637bd05af6c7UL; /* 2**64 / (1000000 / HZ) */ usecs *= 0x0008637bd05af6c7UL; /* 2**64 / (1000000 / HZ) */
#elif defined(CONFIG_MIPS64) && (HZ == 1000) #elif defined(CONFIG_64BIT) && (HZ == 1000)
usecs *= 0x004189374BC6A7f0UL; /* 2**64 / (1000000 / HZ) */ usecs *= 0x004189374BC6A7f0UL; /* 2**64 / (1000000 / HZ) */
#elif defined(CONFIG_MIPS64) #elif defined(CONFIG_64BIT)
usecs *= (0x8000000000000000UL / (500000 / HZ)); usecs *= (0x8000000000000000UL / (500000 / HZ));
#else /* 32-bit junk follows here */ #else /* 32-bit junk follows here */
usecs *= (unsigned long) (((0x8000000000000000ULL / (500000 / HZ)) + usecs *= (unsigned long) (((0x8000000000000000ULL / (500000 / HZ)) +

16
include/asm-mips/elf.h
View File

@ -125,7 +125,7 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
typedef double elf_fpreg_t; typedef double elf_fpreg_t;
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
/* /*
* This is used to ensure we don't load something for the wrong architecture. * This is used to ensure we don't load something for the wrong architecture.
@ -153,9 +153,9 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
*/ */
#define ELF_CLASS ELFCLASS32 #define ELF_CLASS ELFCLASS32
#endif /* CONFIG_MIPS32 */ #endif /* CONFIG_32BIT */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* /*
* This is used to ensure we don't load something for the wrong architecture. * This is used to ensure we don't load something for the wrong architecture.
*/ */
@ -177,7 +177,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
*/ */
#define ELF_CLASS ELFCLASS64 #define ELF_CLASS ELFCLASS64
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
/* /*
* These are used to set parameters in the core dumps. * These are used to set parameters in the core dumps.
@ -193,7 +193,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#define SET_PERSONALITY(ex, ibcs2) \ #define SET_PERSONALITY(ex, ibcs2) \
do { \ do { \
@ -202,9 +202,9 @@ do { \
set_personality(PER_LINUX); \ set_personality(PER_LINUX); \
} while (0) } while (0)
#endif /* CONFIG_MIPS32 */ #endif /* CONFIG_32BIT */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define SET_PERSONALITY(ex, ibcs2) \ #define SET_PERSONALITY(ex, ibcs2) \
do { current->thread.mflags &= ~MF_ABI_MASK; \ do { current->thread.mflags &= ~MF_ABI_MASK; \
@ -222,7 +222,7 @@ do { current->thread.mflags &= ~MF_ABI_MASK; \
set_personality(PER_LINUX); \ set_personality(PER_LINUX); \
} while (0) } while (0)
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
extern void dump_regs(elf_greg_t *, struct pt_regs *regs); extern void dump_regs(elf_greg_t *, struct pt_regs *regs);
extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *); extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *);

4
include/asm-mips/local.h
View File

@ -5,7 +5,7 @@
#include <linux/percpu.h> #include <linux/percpu.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
typedef atomic_t local_t; typedef atomic_t local_t;
@ -20,7 +20,7 @@ typedef atomic_t local_t;
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
typedef atomic64_t local_t; typedef atomic64_t local_t;

8
include/asm-mips/mach-generic/spaces.h
View File

@ -12,7 +12,7 @@
#include <linux/config.h> #include <linux/config.h>
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#define CAC_BASE 0x80000000 #define CAC_BASE 0x80000000
#define IO_BASE 0xa0000000 #define IO_BASE 0xa0000000
@ -32,9 +32,9 @@
#define HIGHMEM_START 0x20000000UL #define HIGHMEM_START 0x20000000UL
#endif #endif
#endif /* CONFIG_MIPS32 */ #endif /* CONFIG_32BIT */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* /*
* This handles the memory map. * This handles the memory map.
@ -67,6 +67,6 @@
#define TO_CAC(x) (CAC_BASE | ((x) & TO_PHYS_MASK)) #define TO_CAC(x) (CAC_BASE | ((x) & TO_PHYS_MASK))
#define TO_UNCAC(x) (UNCAC_BASE | ((x) & TO_PHYS_MASK)) #define TO_UNCAC(x) (UNCAC_BASE | ((x) & TO_PHYS_MASK))
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
#endif /* __ASM_MACH_GENERIC_SPACES_H */ #endif /* __ASM_MACH_GENERIC_SPACES_H */

8
include/asm-mips/mach-ip22/spaces.h
View File

@ -12,7 +12,7 @@
#include <linux/config.h> #include <linux/config.h>
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#define CAC_BASE 0x80000000 #define CAC_BASE 0x80000000
#define IO_BASE 0xa0000000 #define IO_BASE 0xa0000000
@ -32,9 +32,9 @@
#define HIGHMEM_START 0x20000000UL #define HIGHMEM_START 0x20000000UL
#endif #endif
#endif /* CONFIG_MIPS32 */ #endif /* CONFIG_32BIT */
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define PAGE_OFFSET 0xffffffff80000000UL #define PAGE_OFFSET 0xffffffff80000000UL
#ifndef HIGHMEM_START #ifndef HIGHMEM_START
@ -50,6 +50,6 @@
#define TO_CAC(x) (CAC_BASE | ((x) & TO_PHYS_MASK)) #define TO_CAC(x) (CAC_BASE | ((x) & TO_PHYS_MASK))
#define TO_UNCAC(x) (UNCAC_BASE | ((x) & TO_PHYS_MASK)) #define TO_UNCAC(x) (UNCAC_BASE | ((x) & TO_PHYS_MASK))
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
#endif /* __ASM_MACH_IP22_SPACES_H */ #endif /* __ASM_MACH_IP22_SPACES_H */

2
include/asm-mips/mach-ip32/cpu-feature-overrides.h
View File

@ -18,7 +18,7 @@
* so, for 64bit IP32 kernel we just don't use ll/sc. * so, for 64bit IP32 kernel we just don't use ll/sc.
* This does not affect luserland. * This does not affect luserland.
*/ */
#if defined(CONFIG_CPU_R5000) && defined(CONFIG_MIPS64) #if defined(CONFIG_CPU_R5000) && defined(CONFIG_64BIT)
#define cpu_has_llsc 0 #define cpu_has_llsc 0
#else #else
#define cpu_has_llsc 1 #define cpu_has_llsc 1

6
include/asm-mips/mmu_context.h
View File

@ -28,17 +28,17 @@ extern unsigned long pgd_current[];
#define TLBMISS_HANDLER_SETUP_PGD(pgd) \ #define TLBMISS_HANDLER_SETUP_PGD(pgd) \
pgd_current[smp_processor_id()] = (unsigned long)(pgd) pgd_current[smp_processor_id()] = (unsigned long)(pgd)
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#define TLBMISS_HANDLER_SETUP() \ #define TLBMISS_HANDLER_SETUP() \
write_c0_context((unsigned long) smp_processor_id() << 23); \ write_c0_context((unsigned long) smp_processor_id() << 23); \
TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir) TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
#endif #endif
#if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64) #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
#define TLBMISS_HANDLER_SETUP() \ #define TLBMISS_HANDLER_SETUP() \
write_c0_context((unsigned long) &pgd_current[smp_processor_id()] << 23); \ write_c0_context((unsigned long) &pgd_current[smp_processor_id()] << 23); \
TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir) TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
#endif #endif
#if defined(CONFIG_MIPS64) && defined(CONFIG_BUILD_ELF64) #if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
#define TLBMISS_HANDLER_SETUP() \ #define TLBMISS_HANDLER_SETUP() \
write_c0_context((unsigned long) smp_processor_id() << 23); \ write_c0_context((unsigned long) smp_processor_id() << 23); \
TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir) TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)

4
include/asm-mips/module.h
View File

@ -25,7 +25,7 @@ typedef struct
Elf64_Sxword r_addend; /* Addend. */ Elf64_Sxword r_addend; /* Addend. */
} Elf64_Mips_Rela; } Elf64_Mips_Rela;
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#define Elf_Shdr Elf32_Shdr #define Elf_Shdr Elf32_Shdr
#define Elf_Sym Elf32_Sym #define Elf_Sym Elf32_Sym
@ -33,7 +33,7 @@ typedef struct
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define Elf_Shdr Elf64_Shdr #define Elf_Shdr Elf64_Shdr
#define Elf_Sym Elf64_Sym #define Elf_Sym Elf64_Sym

12
include/asm-mips/msgbuf.h
View File

@ -15,25 +15,25 @@
struct msqid64_ds { struct msqid64_ds {
struct ipc64_perm msg_perm; struct ipc64_perm msg_perm;
#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN) #if defined(CONFIG_32BIT) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused1; unsigned long __unused1;
#endif #endif
__kernel_time_t msg_stime; /* last msgsnd time */ __kernel_time_t msg_stime; /* last msgsnd time */
#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN) #if defined(CONFIG_32BIT) && defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused1; unsigned long __unused1;
#endif #endif
#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN) #if defined(CONFIG_32BIT) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused2; unsigned long __unused2;
#endif #endif
__kernel_time_t msg_rtime; /* last msgrcv time */ __kernel_time_t msg_rtime; /* last msgrcv time */
#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN) #if defined(CONFIG_32BIT) && defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused2; unsigned long __unused2;
#endif #endif
#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN) #if defined(CONFIG_32BIT) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused3; unsigned long __unused3;
#endif #endif
__kernel_time_t msg_ctime; /* last change time */ __kernel_time_t msg_ctime; /* last change time */
#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN) #if defined(CONFIG_32BIT) && defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused3; unsigned long __unused3;
#endif #endif
unsigned long msg_cbytes; /* current number of bytes on queue */ unsigned long msg_cbytes; /* current number of bytes on queue */

4
include/asm-mips/paccess.h
View File

@ -16,10 +16,10 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/errno.h> #include <linux/errno.h>
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#define __PA_ADDR ".word" #define __PA_ADDR ".word"
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define __PA_ADDR ".dword" #define __PA_ADDR ".dword"
#endif #endif

4
include/asm-mips/pgalloc.h
View File

@ -85,7 +85,7 @@ static inline void pte_free(struct page *pte)
#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#define pgd_populate(mm, pmd, pte) BUG() #define pgd_populate(mm, pmd, pte) BUG()
/* /*
@ -97,7 +97,7 @@ static inline void pte_free(struct page *pte)
#define __pmd_free_tlb(tlb,x) do { } while (0) #define __pmd_free_tlb(tlb,x) do { } while (0)
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#define pgd_populate(mm, pgd, pmd) set_pgd(pgd, __pgd(pmd)) #define pgd_populate(mm, pgd, pmd) set_pgd(pgd, __pgd(pmd))

4
include/asm-mips/pgtable.h
View File

@ -11,10 +11,10 @@
#include <asm-generic/4level-fixup.h> #include <asm-generic/4level-fixup.h>
#include <linux/config.h> #include <linux/config.h>
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
#include <asm/pgtable-32.h> #include <asm/pgtable-32.h>
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
#include <asm/pgtable-64.h> #include <asm/pgtable-64.h>
#endif #endif

4
include/asm-mips/processor.h
View File

@ -33,7 +33,7 @@ extern void (*cpu_wait)(void);
extern unsigned int vced_count, vcei_count; extern unsigned int vced_count, vcei_count;
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
/* /*
* User space process size: 2GB. This is hardcoded into a few places, * User space process size: 2GB. This is hardcoded into a few places,
* so don't change it unless you know what you are doing. * so don't change it unless you know what you are doing.
@ -47,7 +47,7 @@ extern unsigned int vced_count, vcei_count;
#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
#endif #endif
#ifdef CONFIG_MIPS64 #ifdef CONFIG_64BIT
/* /*
* User space process size: 1TB. This is hardcoded into a few places, * User space process size: 1TB. This is hardcoded into a few places,
* so don't change it unless you know what you are doing. TASK_SIZE * so don't change it unless you know what you are doing. TASK_SIZE

2
include/asm-mips/ptrace.h
View File

@ -28,7 +28,7 @@
* system call/exception. As usual the registers k0/k1 aren't being saved. * system call/exception. As usual the registers k0/k1 aren't being saved.
*/ */
struct pt_regs { struct pt_regs {
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
/* Pad bytes for argument save space on the stack. */ /* Pad bytes for argument save space on the stack. */
unsigned long pad0[6]; unsigned long pad0[6];
#endif #endif

6
include/asm-mips/reg.h
View File

@ -14,7 +14,7 @@
#include <linux/config.h> #include <linux/config.h>
#if defined(CONFIG_MIPS32) || defined(WANT_COMPAT_REG_H) #if defined(CONFIG_32BIT) || defined(WANT_COMPAT_REG_H)
#define EF_R0 6 #define EF_R0 6
#define EF_R1 7 #define EF_R1 7
@ -70,7 +70,7 @@
#endif #endif
#if CONFIG_MIPS64 #if CONFIG_64BIT
#define EF_R0 0 #define EF_R0 0
#define EF_R1 1 #define EF_R1 1
@ -124,6 +124,6 @@
#define EF_SIZE 304 /* size in bytes */ #define EF_SIZE 304 /* size in bytes */
#endif /* CONFIG_MIPS64 */ #endif /* CONFIG_64BIT */
#endif /* __ASM_MIPS_REG_H */ #endif /* __ASM_MIPS_REG_H */

2
include/asm-mips/resource.h
View File

@ -27,7 +27,7 @@
* but we keep the old value on MIPS32, * but we keep the old value on MIPS32,
* for compatibility: * for compatibility:
*/ */
#ifdef CONFIG_MIPS32 #ifdef CONFIG_32BIT
# define RLIM_INFINITY 0x7fffffffUL # define RLIM_INFINITY 0x7fffffffUL
#endif #endif

Some files were not shown because too many files have changed in this diff Show More