CVSROOT: /home/cvs
Module name: linux
Changes by: ralf@ftp.linux-mips.org 05/07/14 13:05:11
Modified files:
arch/mips : Kconfig Makefile defconfig
arch/mips/configs: atlas_defconfig capcella_defconfig
cobalt_defconfig db1000_defconfig
db1100_defconfig db1500_defconfig
db1550_defconfig ddb5476_defconfig
ddb5477_defconfig decstation_defconfig
e55_defconfig ev64120_defconfig
ev96100_defconfig ip22_defconfig
ip27_defconfig ip32_defconfig
it8172_defconfig ivr_defconfig
jaguar-atx_defconfig jmr3927_defconfig
lasat200_defconfig malta_defconfig
mpc30x_defconfig ocelot_3_defconfig
ocelot_c_defconfig ocelot_defconfig
ocelot_g_defconfig pb1100_defconfig
pb1500_defconfig pb1550_defconfig
qemu_defconfig rm200_defconfig
sb1250-swarm_defconfig sead_defconfig
tb0226_defconfig tb0229_defconfig
workpad_defconfig yosemite_defconfig
arch/mips/dec : int-handler.S
arch/mips/dec/prom: Makefile
arch/mips/kernel: Makefile gdb-low.S genex.S head.S mips_ksyms.c
offset.c process.c ptrace.c r4k_fpu.S
r4k_switch.S setup.c signal-common.h syscall.c
traps.c unaligned.c
arch/mips/lib : memcpy.S
arch/mips/math-emu: kernel_linkage.c
arch/mips/mm : Makefile c-r4k.c init.c pg-sb1.c tlbex.c
arch/mips/momentum/jaguar_atx: prom.c reset.c setup.c
arch/mips/momentum/ocelot_3: prom.c
arch/mips/momentum/ocelot_c: ocelot_c_fpga.h prom.c reset.c
setup.c
arch/mips/pci : pci-ip32.c
arch/mips/sibyte/cfe: setup.c
arch/mips/sibyte/swarm: setup.c
drivers/net : titan_ge.h
include/asm-mips: a.out.h addrspace.h asmmacro.h atomic.h
bitops.h bugs.h checksum.h cpu-features.h
delay.h elf.h local.h mmu_context.h module.h
msgbuf.h paccess.h page.h pgalloc.h pgtable.h
processor.h ptrace.h reg.h resource.h
sgiarcs.h siginfo.h sim.h stackframe.h
string.h system.h thread_info.h types.h
uaccess.h unistd.h
include/asm-mips/dec: prom.h
include/asm-mips/mach-generic: spaces.h
include/asm-mips/mach-ip22: spaces.h
include/asm-mips/mach-ip32: cpu-feature-overrides.h
Log message:
Change CONFIG_MIPS32 to CONFIG_32BIT and CONFIG_MIPS64 to CONFIG_64BIT.
diff -urN linux/arch/mips/Kconfig linux/arch/mips/Kconfig
--- linux/arch/mips/Kconfig 2005/07/13 11:48:59 1.154
+++ linux/arch/mips/Kconfig 2005/07/14 12:05:02 1.155
@@ -1090,13 +1090,13 @@
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 MIPS32
+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 MIPS64
+config 64BIT
bool "64-bit kernel"
depends on CPU_SUPPORTS_64BIT_KERNEL && SYS_SUPPORTS_64BIT_KERNEL
help
@@ -1104,9 +1104,6 @@
endchoice
-config 64BIT
- def_bool MIPS64
-
choice
prompt "Kernel page size"
default PAGE_SIZE_4KB
@@ -1194,11 +1191,11 @@
config 64BIT_PHYS_ADDR
bool "Support for 64-bit physical address space"
- depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 ||
CPU_R10000 || CPU_SB1 || CPU_MIPS32_R1 || CPU_MIPS64_R1) && MIPS32
+ depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 ||
CPU_R10000 || CPU_SB1 || CPU_MIPS32_R1 || CPU_MIPS64_R1) && 32BIT
config CPU_ADVANCED
bool "Override CPU Options"
- depends on MIPS32
+ depends on 32BIT
help
Saying yes here allows you to select support for various features
your CPU may or may not have. Most people should say N here.
@@ -1252,7 +1249,7 @@
#
config HIGHMEM
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
def_bool y
@@ -1305,7 +1302,7 @@
config MIPS_INSANE_LARGE
bool "Support for large 64-bit configurations"
- depends on CPU_R10000 && MIPS64
+ depends on CPU_R10000 && 64BIT
help
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
@@ -1405,7 +1402,7 @@
config BUILD_ELF64
bool "Use 64-bit ELF format for building"
- depends on MIPS64
+ depends on 64BIT
help
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
@@ -1420,11 +1417,11 @@
config BINFMT_IRIX
bool "Include IRIX binary compatibility"
- depends on CPU_BIG_ENDIAN && MIPS32 && BROKEN
+ depends on CPU_BIG_ENDIAN && 32BIT && BROKEN
config MIPS32_COMPAT
bool "Kernel support for Linux/MIPS 32-bit binary compatibility"
- depends on MIPS64
+ depends on 64BIT
help
Select this option if you want Linux/MIPS 32-bit binary
compatibility. Since all software available for Linux/MIPS is
diff -urN linux/arch/mips/Makefile linux/arch/mips/Makefile
--- linux/arch/mips/Makefile 2005/07/12 14:56:53 1.202
+++ linux/arch/mips/Makefile 2005/07/14 12:05:02 1.203
@@ -37,12 +37,12 @@
64bit-emul = elf64btsmip
endif
-ifdef CONFIG_MIPS32
+ifdef CONFIG_32BIT
gcc-abi = 32
tool-prefix = $(32bit-tool-prefix)
UTS_MACHINE := mips
endif
-ifdef CONFIG_MIPS64
+ifdef CONFIG_64BIT
gcc-abi = 64
tool-prefix = $(64bit-tool-prefix)
UTS_MACHINE := mips64
@@ -53,9 +53,9 @@
endif
CHECKFLAGS-y += -D__linux__ -D__mips__
-CHECKFLAGS-$(CONFIG_MIPS32) += -D_MIPS_SZLONG=32 \
+CHECKFLAGS-$(CONFIG_32BIT) += -D_MIPS_SZLONG=32 \
-D__PTRDIFF_TYPE__=int
-CHECKFLAGS-$(CONFIG_MIPS64) += -D_MIPS_SZLONG=64 \
+CHECKFLAGS-$(CONFIG_64BIT) += -D_MIPS_SZLONG=64 \
-D__PTRDIFF_TYPE__="long int"
CHECKFLAGS-$(CONFIG_CPU_BIG_ENDIAN) += -D__MIPSEB__
CHECKFLAGS-$(CONFIG_CPU_LITTLE_ENDIAN) += -D__MIPSEL__
@@ -73,7 +73,7 @@
vmlinux-32 = vmlinux
vmlinux-64 = vmlinux.64
-cflags-$(CONFIG_MIPS64) += $(call cc-option,-mno-explicit-relocs)
+cflags-$(CONFIG_64BIT) += $(call cc-option,-mno-explicit-relocs)
endif
#
@@ -577,10 +577,10 @@
#
core-$(CONFIG_SGI_IP22) += arch/mips/sgi-ip22/
cflags-$(CONFIG_SGI_IP22) += -Iinclude/asm-mips/mach-ip22
-ifdef CONFIG_MIPS32
+ifdef CONFIG_32BIT
load-$(CONFIG_SGI_IP22) += 0xffffffff88002000
endif
-ifdef CONFIG_MIPS64
+ifdef CONFIG_64BIT
load-$(CONFIG_SGI_IP22) += 0xffffffff88004000
endif
@@ -685,7 +685,7 @@
cflags-y += -Iinclude/asm-mips/mach-generic
drivers-$(CONFIG_PCI) += arch/mips/pci/
-ifdef CONFIG_MIPS32
+ifdef CONFIG_32BIT
ifdef CONFIG_CPU_LITTLE_ENDIAN
JIFFIES = jiffies_64
else
@@ -717,8 +717,8 @@
head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
libs-y += arch/mips/lib/
-libs-$(CONFIG_MIPS32) += arch/mips/lib-32/
-libs-$(CONFIG_MIPS64) += arch/mips/lib-64/
+libs-$(CONFIG_32BIT) += arch/mips/lib-32/
+libs-$(CONFIG_64BIT) += arch/mips/lib-64/
core-y += arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/
diff -urN linux/arch/mips/defconfig linux/arch/mips/defconfig
--- linux/arch/mips/defconfig 2005/07/13 11:48:59 1.299
+++ linux/arch/mips/defconfig 2005/07/14 12:05:02 1.300
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:07 2005
+# Thu Jul 14 12:13:31 2005
#
CONFIG_MIPS=y
@@ -154,8 +154,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -472,7 +471,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/atlas_defconfig
linux/arch/mips/configs/atlas_defconfig
--- linux/arch/mips/configs/atlas_defconfig 2005/07/13 11:48:59 1.63
+++ linux/arch/mips/configs/atlas_defconfig 2005/07/14 12:05:03 1.64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:08 2005
+# Thu Jul 14 12:13:35 2005
#
CONFIG_MIPS=y
@@ -152,8 +152,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -522,7 +521,6 @@
CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_INITRD is not set
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/capcella_defconfig
linux/arch/mips/configs/capcella_defconfig
--- linux/arch/mips/configs/capcella_defconfig 2005/07/13 11:48:59 1.63
+++ linux/arch/mips/configs/capcella_defconfig 2005/07/14 12:05:03 1.64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:09 2005
+# Thu Jul 14 12:13:37 2005
#
CONFIG_MIPS=y
@@ -157,8 +157,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -310,7 +309,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/cobalt_defconfig
linux/arch/mips/configs/cobalt_defconfig
--- linux/arch/mips/configs/cobalt_defconfig 2005/07/13 11:48:59 1.60
+++ linux/arch/mips/configs/cobalt_defconfig 2005/07/14 12:05:03 1.61
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:09 2005
+# Thu Jul 14 12:13:40 2005
#
CONFIG_MIPS=y
@@ -143,8 +143,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -295,7 +294,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=y
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/db1000_defconfig
linux/arch/mips/configs/db1000_defconfig
--- linux/arch/mips/configs/db1000_defconfig 2005/07/13 11:48:59 1.66
+++ linux/arch/mips/configs/db1000_defconfig 2005/07/14 12:05:03 1.67
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:10 2005
+# Thu Jul 14 12:13:43 2005
#
CONFIG_MIPS=y
@@ -146,8 +146,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -391,7 +390,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/db1100_defconfig
linux/arch/mips/configs/db1100_defconfig
--- linux/arch/mips/configs/db1100_defconfig 2005/07/13 11:48:59 1.65
+++ linux/arch/mips/configs/db1100_defconfig 2005/07/14 12:05:03 1.66
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:10 2005
+# Thu Jul 14 12:13:45 2005
#
CONFIG_MIPS=y
@@ -146,8 +146,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -379,7 +378,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/db1500_defconfig
linux/arch/mips/configs/db1500_defconfig
--- linux/arch/mips/configs/db1500_defconfig 2005/07/13 11:49:00 1.68
+++ linux/arch/mips/configs/db1500_defconfig 2005/07/14 12:05:03 1.69
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:11 2005
+# Thu Jul 14 12:13:48 2005
#
CONFIG_MIPS=y
@@ -148,8 +148,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -407,7 +406,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/db1550_defconfig
linux/arch/mips/configs/db1550_defconfig
--- linux/arch/mips/configs/db1550_defconfig 2005/07/13 11:49:00 1.43
+++ linux/arch/mips/configs/db1550_defconfig 2005/07/14 12:05:03 1.44
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:11 2005
+# Thu Jul 14 12:13:51 2005
#
CONFIG_MIPS=y
@@ -147,8 +147,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -410,7 +409,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/ddb5476_defconfig
linux/arch/mips/configs/ddb5476_defconfig
--- linux/arch/mips/configs/ddb5476_defconfig 2005/07/13 11:49:00 1.60
+++ linux/arch/mips/configs/ddb5476_defconfig 2005/07/14 12:05:03 1.61
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:12 2005
+# Thu Jul 14 12:13:54 2005
#
CONFIG_MIPS=y
@@ -144,8 +144,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -300,7 +299,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=y
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/ddb5477_defconfig
linux/arch/mips/configs/ddb5477_defconfig
--- linux/arch/mips/configs/ddb5477_defconfig 2005/07/13 11:49:00 1.60
+++ linux/arch/mips/configs/ddb5477_defconfig 2005/07/14 12:05:03 1.61
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:13 2005
+# Thu Jul 14 12:13:56 2005
#
CONFIG_MIPS=y
@@ -144,8 +144,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -298,7 +297,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=y
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/decstation_defconfig
linux/arch/mips/configs/decstation_defconfig
--- linux/arch/mips/configs/decstation_defconfig 2005/07/13 11:49:00
1.77
+++ linux/arch/mips/configs/decstation_defconfig 2005/07/14 12:05:03
1.78
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:13 2005
+# Thu Jul 14 12:13:58 2005
#
CONFIG_MIPS=y
@@ -148,8 +148,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -292,7 +291,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
# CONFIG_CDROM_PKTCDVD is not set
#
@@ -344,7 +342,6 @@
# SCSI low-level drivers
#
CONFIG_SCSI_DECNCR=y
-# CONFIG_SCSI_DECSII is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_DEBUG is not set
@@ -446,7 +443,6 @@
#
# Non-8250 serial port support
#
-# CONFIG_SERIAL_DZ is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
diff -urN linux/arch/mips/configs/e55_defconfig
linux/arch/mips/configs/e55_defconfig
--- linux/arch/mips/configs/e55_defconfig 2005/07/13 11:49:00 1.63
+++ linux/arch/mips/configs/e55_defconfig 2005/07/14 12:05:03 1.64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:14 2005
+# Thu Jul 14 12:14:01 2005
#
CONFIG_MIPS=y
@@ -155,8 +155,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -297,7 +296,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/ev64120_defconfig
linux/arch/mips/configs/ev64120_defconfig
--- linux/arch/mips/configs/ev64120_defconfig 2005/07/13 11:49:00 1.59
+++ linux/arch/mips/configs/ev64120_defconfig 2005/07/14 12:05:03 1.60
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:14 2005
+# Thu Jul 14 12:14:03 2005
#
CONFIG_MIPS=y
@@ -151,8 +151,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -305,7 +304,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/ev96100_defconfig
linux/arch/mips/configs/ev96100_defconfig
--- linux/arch/mips/configs/ev96100_defconfig 2005/07/13 11:49:00 1.60
+++ linux/arch/mips/configs/ev96100_defconfig 2005/07/14 12:05:03 1.61
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:15 2005
+# Thu Jul 14 12:14:06 2005
#
CONFIG_MIPS=y
@@ -150,8 +150,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -299,7 +298,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/ip22_defconfig
linux/arch/mips/configs/ip22_defconfig
--- linux/arch/mips/configs/ip22_defconfig 2005/07/13 11:49:00 1.69
+++ linux/arch/mips/configs/ip22_defconfig 2005/07/14 12:05:03 1.70
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:15 2005
+# Thu Jul 14 12:14:09 2005
#
CONFIG_MIPS=y
@@ -154,8 +154,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -472,7 +471,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/ip27_defconfig
linux/arch/mips/configs/ip27_defconfig
--- linux/arch/mips/configs/ip27_defconfig 2005/07/13 11:49:00 1.73
+++ linux/arch/mips/configs/ip27_defconfig 2005/07/14 12:05:03 1.74
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:16 2005
+# Thu Jul 14 12:14:11 2005
#
CONFIG_MIPS=y
@@ -158,8 +158,7 @@
#
# Kernel type
#
-# CONFIG_MIPS32 is not set
-CONFIG_MIPS64=y
+# CONFIG_32BIT is not set
CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
diff -urN linux/arch/mips/configs/ip32_defconfig
linux/arch/mips/configs/ip32_defconfig
--- linux/arch/mips/configs/ip32_defconfig 2005/07/13 11:49:00 1.63
+++ linux/arch/mips/configs/ip32_defconfig 2005/07/14 12:05:03 1.64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:17 2005
+# Thu Jul 14 12:14:15 2005
#
CONFIG_MIPS=y
@@ -147,8 +147,7 @@
#
# Kernel type
#
-# CONFIG_MIPS32 is not set
-CONFIG_MIPS64=y
+# CONFIG_32BIT is not set
CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
diff -urN linux/arch/mips/configs/it8172_defconfig
linux/arch/mips/configs/it8172_defconfig
--- linux/arch/mips/configs/it8172_defconfig 2005/07/13 11:49:00 1.59
+++ linux/arch/mips/configs/it8172_defconfig 2005/07/14 12:05:03 1.60
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:17 2005
+# Thu Jul 14 12:14:17 2005
#
CONFIG_MIPS=y
@@ -151,8 +151,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -368,7 +367,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/ivr_defconfig
linux/arch/mips/configs/ivr_defconfig
--- linux/arch/mips/configs/ivr_defconfig 2005/07/13 11:49:00 1.59
+++ linux/arch/mips/configs/ivr_defconfig 2005/07/14 12:05:03 1.60
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:18 2005
+# Thu Jul 14 12:14:19 2005
#
CONFIG_MIPS=y
@@ -149,8 +149,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -303,7 +302,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/jaguar-atx_defconfig
linux/arch/mips/configs/jaguar-atx_defconfig
--- linux/arch/mips/configs/jaguar-atx_defconfig 2005/07/13 11:49:00
1.64
+++ linux/arch/mips/configs/jaguar-atx_defconfig 2005/07/14 12:05:03
1.65
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:18 2005
+# Thu Jul 14 12:14:22 2005
#
CONFIG_MIPS=y
@@ -152,8 +152,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -299,7 +298,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/jmr3927_defconfig
linux/arch/mips/configs/jmr3927_defconfig
--- linux/arch/mips/configs/jmr3927_defconfig 2005/07/13 11:49:00 1.60
+++ linux/arch/mips/configs/jmr3927_defconfig 2005/07/14 12:05:03 1.61
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:19 2005
+# Thu Jul 14 12:14:24 2005
#
CONFIG_MIPS=y
@@ -141,8 +141,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -294,7 +293,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=y
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/lasat200_defconfig
linux/arch/mips/configs/lasat200_defconfig
--- linux/arch/mips/configs/lasat200_defconfig 2005/07/13 11:49:00 1.60
+++ linux/arch/mips/configs/lasat200_defconfig 2005/07/14 12:05:03 1.61
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:19 2005
+# Thu Jul 14 12:14:27 2005
#
CONFIG_MIPS=y
@@ -152,8 +152,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -376,7 +375,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/malta_defconfig
linux/arch/mips/configs/malta_defconfig
--- linux/arch/mips/configs/malta_defconfig 2005/07/13 11:49:00 1.62
+++ linux/arch/mips/configs/malta_defconfig 2005/07/14 12:05:03 1.63
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:20 2005
+# Thu Jul 14 12:14:30 2005
#
CONFIG_MIPS=y
@@ -155,8 +155,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -523,7 +522,6 @@
CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_INITRD is not set
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/mpc30x_defconfig
linux/arch/mips/configs/mpc30x_defconfig
--- linux/arch/mips/configs/mpc30x_defconfig 2005/07/13 11:49:00 1.64
+++ linux/arch/mips/configs/mpc30x_defconfig 2005/07/14 12:05:03 1.65
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:21 2005
+# Thu Jul 14 12:14:32 2005
#
CONFIG_MIPS=y
@@ -157,8 +157,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -310,7 +309,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/ocelot_3_defconfig
linux/arch/mips/configs/ocelot_3_defconfig
--- linux/arch/mips/configs/ocelot_3_defconfig 2005/07/13 11:49:00 1.32
+++ linux/arch/mips/configs/ocelot_3_defconfig 2005/07/14 12:05:03 1.33
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:21 2005
+# Thu Jul 14 12:14:36 2005
#
CONFIG_MIPS=y
@@ -153,8 +153,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -341,7 +340,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
# CONFIG_CDROM_PKTCDVD is not set
#
diff -urN linux/arch/mips/configs/ocelot_c_defconfig
linux/arch/mips/configs/ocelot_c_defconfig
--- linux/arch/mips/configs/ocelot_c_defconfig 2005/07/13 11:49:00 1.58
+++ linux/arch/mips/configs/ocelot_c_defconfig 2005/07/14 12:05:03 1.59
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:22 2005
+# Thu Jul 14 12:14:38 2005
#
CONFIG_MIPS=y
@@ -144,8 +144,7 @@
#
# Kernel type
#
-# CONFIG_MIPS32 is not set
-CONFIG_MIPS64=y
+# CONFIG_32BIT is not set
CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
diff -urN linux/arch/mips/configs/ocelot_defconfig
linux/arch/mips/configs/ocelot_defconfig
--- linux/arch/mips/configs/ocelot_defconfig 2005/07/13 11:49:00 1.60
+++ linux/arch/mips/configs/ocelot_defconfig 2005/07/14 12:05:03 1.61
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:22 2005
+# Thu Jul 14 12:14:40 2005
#
CONFIG_MIPS=y
@@ -147,8 +147,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -296,7 +295,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=y
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/ocelot_g_defconfig
linux/arch/mips/configs/ocelot_g_defconfig
--- linux/arch/mips/configs/ocelot_g_defconfig 2005/07/13 11:49:00 1.53
+++ linux/arch/mips/configs/ocelot_g_defconfig 2005/07/14 12:05:03 1.54
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:23 2005
+# Thu Jul 14 12:14:43 2005
#
CONFIG_MIPS=y
@@ -147,8 +147,7 @@
#
# Kernel type
#
-# CONFIG_MIPS32 is not set
-CONFIG_MIPS64=y
+# CONFIG_32BIT is not set
CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
diff -urN linux/arch/mips/configs/pb1100_defconfig
linux/arch/mips/configs/pb1100_defconfig
--- linux/arch/mips/configs/pb1100_defconfig 2005/07/13 11:49:00 1.62
+++ linux/arch/mips/configs/pb1100_defconfig 2005/07/14 12:05:03 1.63
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:24 2005
+# Thu Jul 14 12:14:46 2005
#
CONFIG_MIPS=y
@@ -148,8 +148,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -393,7 +392,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/pb1500_defconfig
linux/arch/mips/configs/pb1500_defconfig
--- linux/arch/mips/configs/pb1500_defconfig 2005/07/13 11:49:00 1.68
+++ linux/arch/mips/configs/pb1500_defconfig 2005/07/14 12:05:03 1.69
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:24 2005
+# Thu Jul 14 12:14:49 2005
#
CONFIG_MIPS=y
@@ -147,8 +147,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -406,7 +405,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/pb1550_defconfig
linux/arch/mips/configs/pb1550_defconfig
--- linux/arch/mips/configs/pb1550_defconfig 2005/07/13 11:49:00 1.58
+++ linux/arch/mips/configs/pb1550_defconfig 2005/07/14 12:05:03 1.59
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:25 2005
+# Thu Jul 14 12:14:53 2005
#
CONFIG_MIPS=y
@@ -147,8 +147,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -406,7 +405,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/qemu_defconfig
linux/arch/mips/configs/qemu_defconfig
--- linux/arch/mips/configs/qemu_defconfig 2005/07/13 11:49:00 1.5
+++ linux/arch/mips/configs/qemu_defconfig 2005/07/14 12:05:03 1.6
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:25 2005
+# Thu Jul 14 12:14:55 2005
#
CONFIG_MIPS=y
@@ -142,8 +142,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -271,7 +270,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
# CONFIG_CDROM_PKTCDVD is not set
#
diff -urN linux/arch/mips/configs/rm200_defconfig
linux/arch/mips/configs/rm200_defconfig
--- linux/arch/mips/configs/rm200_defconfig 2005/07/13 11:49:00 1.70
+++ linux/arch/mips/configs/rm200_defconfig 2005/07/14 12:05:03 1.71
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:26 2005
+# Thu Jul 14 12:14:58 2005
#
CONFIG_MIPS=y
@@ -158,8 +158,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -546,7 +545,6 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/sb1250-swarm_defconfig
linux/arch/mips/configs/sb1250-swarm_defconfig
--- linux/arch/mips/configs/sb1250-swarm_defconfig 2005/07/13 11:49:00
1.66
+++ linux/arch/mips/configs/sb1250-swarm_defconfig 2005/07/14 12:05:03
1.67
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:27 2005
+# Thu Jul 14 12:15:01 2005
#
CONFIG_MIPS=y
@@ -166,8 +166,7 @@
#
# Kernel type
#
-# CONFIG_MIPS32 is not set
-CONFIG_MIPS64=y
+# CONFIG_32BIT is not set
CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
diff -urN linux/arch/mips/configs/sead_defconfig
linux/arch/mips/configs/sead_defconfig
--- linux/arch/mips/configs/sead_defconfig 2005/07/13 11:49:00 1.58
+++ linux/arch/mips/configs/sead_defconfig 2005/07/14 12:05:03 1.59
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:27 2005
+# Thu Jul 14 12:15:04 2005
#
CONFIG_MIPS=y
@@ -139,8 +139,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -225,7 +224,6 @@
CONFIG_BLK_DEV_RAM_SIZE=18432
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
# CONFIG_CDROM_PKTCDVD is not set
#
diff -urN linux/arch/mips/configs/tb0226_defconfig
linux/arch/mips/configs/tb0226_defconfig
--- linux/arch/mips/configs/tb0226_defconfig 2005/07/13 11:49:00 1.62
+++ linux/arch/mips/configs/tb0226_defconfig 2005/07/14 12:05:03 1.63
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:28 2005
+# Thu Jul 14 12:15:08 2005
#
CONFIG_MIPS=y
@@ -155,8 +155,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -307,7 +306,6 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/tb0229_defconfig
linux/arch/mips/configs/tb0229_defconfig
--- linux/arch/mips/configs/tb0229_defconfig 2005/07/13 11:49:00 1.65
+++ linux/arch/mips/configs/tb0229_defconfig 2005/07/14 12:05:03 1.66
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:28 2005
+# Thu Jul 14 12:15:10 2005
#
CONFIG_MIPS=y
@@ -157,8 +157,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -319,7 +318,6 @@
CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_INITRD is not set
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/workpad_defconfig
linux/arch/mips/configs/workpad_defconfig
--- linux/arch/mips/configs/workpad_defconfig 2005/07/13 11:49:00 1.63
+++ linux/arch/mips/configs/workpad_defconfig 2005/07/14 12:05:03 1.64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:29 2005
+# Thu Jul 14 12:15:12 2005
#
CONFIG_MIPS=y
@@ -155,8 +155,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -297,7 +296,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/configs/yosemite_defconfig
linux/arch/mips/configs/yosemite_defconfig
--- linux/arch/mips/configs/yosemite_defconfig 2005/07/13 11:49:00 1.64
+++ linux/arch/mips/configs/yosemite_defconfig 2005/07/14 12:05:03 1.65
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 11:31:30 2005
+# Thu Jul 14 12:15:15 2005
#
CONFIG_MIPS=y
@@ -152,8 +152,7 @@
#
# Kernel type
#
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
+CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set
@@ -302,7 +301,6 @@
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
diff -urN linux/arch/mips/dec/int-handler.S linux/arch/mips/dec/int-handler.S
--- linux/arch/mips/dec/int-handler.S 2005/07/01 16:10:40 1.16
+++ linux/arch/mips/dec/int-handler.S 2005/07/14 12:05:05 1.17
@@ -137,7 +137,7 @@
*/
mfc0 t0,CP0_CAUSE # get pending interrupts
mfc0 t1,CP0_STATUS
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
lw t2,cpu_fpu_mask
#endif
andi t0,ST0_IM # CAUSE.CE may be non-zero!
@@ -145,7 +145,7 @@
beqz t0,spurious
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
and t2,t0
bnez t2,fpu # handle FPU immediately
#endif
@@ -275,7 +275,7 @@
j ret_from_irq
nop
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
fpu:
j handle_fpe_int
nop
diff -urN linux/arch/mips/dec/prom/Makefile linux/arch/mips/dec/prom/Makefile
--- linux/arch/mips/dec/prom/Makefile 2004/02/11 15:17:32 1.12
+++ linux/arch/mips/dec/prom/Makefile 2005/07/14 12:05:05 1.13
@@ -5,7 +5,7 @@
lib-y += init.o memory.o cmdline.o identify.o console.o
-lib-$(CONFIG_MIPS32) += locore.o
-lib-$(CONFIG_MIPS64) += call_o32.o
+lib-$(CONFIG_32BIT) += locore.o
+lib-$(CONFIG_64BIT) += call_o32.o
EXTRA_AFLAGS := $(CFLAGS)
diff -urN linux/arch/mips/kernel/Makefile linux/arch/mips/kernel/Makefile
--- linux/arch/mips/kernel/Makefile 2005/07/06 12:08:13 1.89
+++ linux/arch/mips/kernel/Makefile 2005/07/14 12:05:05 1.90
@@ -41,8 +41,8 @@
obj-$(CONFIG_IRQ_CPU_RM9K) += irq-rm9000.o
obj-$(CONFIG_IRQ_MV64340) += irq-mv6434x.o
-obj-$(CONFIG_MIPS32) += scall32-o32.o
-obj-$(CONFIG_MIPS64) += scall64-64.o
+obj-$(CONFIG_32BIT) += scall32-o32.o
+obj-$(CONFIG_64BIT) += scall64-64.o
obj-$(CONFIG_BINFMT_IRIX) += binfmt_irix.o
obj-$(CONFIG_MIPS32_COMPAT) += ioctl32.o linux32.o signal32.o
obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o
@@ -51,7 +51,7 @@
obj-$(CONFIG_KGDB) += gdb-low.o gdb-stub.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
diff -urN linux/arch/mips/kernel/gdb-low.S linux/arch/mips/kernel/gdb-low.S
--- linux/arch/mips/kernel/gdb-low.S 2003/11/17 17:19:39 1.17
+++ linux/arch/mips/kernel/gdb-low.S 2005/07/14 12:05:05 1.18
@@ -13,13 +13,13 @@
#include <asm/stackframe.h>
#include <asm/gdb-stub.h>
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define DMFC0 mfc0
#define DMTC0 mtc0
#define LDC1 lwc1
#define SDC1 lwc1
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define DMFC0 dmfc0
#define DMTC0 dmtc0
#define LDC1 ldc1
diff -urN linux/arch/mips/kernel/genex.S linux/arch/mips/kernel/genex.S
--- linux/arch/mips/kernel/genex.S 2005/07/11 10:03:25 1.12
+++ linux/arch/mips/kernel/genex.S 2005/07/14 12:05:05 1.13
@@ -54,7 +54,7 @@
#endif
mfc0 k1, CP0_CAUSE
andi k1, k1, 0x7c
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
dsll k1, k1, 1
#endif
PTR_L k0, exception_handlers(k1)
@@ -81,7 +81,7 @@
beq k1, k0, handle_vced
li k0, 14<<2
beq k1, k0, handle_vcei
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
dsll k1, k1, 1
#endif
.set pop
@@ -244,10 +244,10 @@
start with an n and gas will believe \n is ok ... */
.macro __BUILD_verbose nexception
LONG_L a1, PT_EPC(sp)
-#if CONFIG_MIPS32
+#if CONFIG_32BIT
PRINT("Got \nexception at %08lx\012")
#endif
-#if CONFIG_MIPS64
+#if CONFIG_64BIT
PRINT("Got \nexception at %016lx\012")
#endif
.endm
@@ -294,7 +294,7 @@
BUILD_HANDLER dsp dsp sti silent /* #26 */
BUILD_HANDLER reserved reserved sti verbose /* others */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/* A temporary overflow handler used by check_daddi(). */
__INIT
diff -urN linux/arch/mips/kernel/head.S linux/arch/mips/kernel/head.S
--- linux/arch/mips/kernel/head.S 2005/07/14 09:42:32 1.69
+++ linux/arch/mips/kernel/head.S 2005/07/14 12:05:05 1.70
@@ -92,7 +92,7 @@
.endm
.macro setup_c0_status_pri
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
setup_c0_status ST0_KX 0
#else
setup_c0_status 0 0
@@ -100,7 +100,7 @@
.endm
.macro setup_c0_status_sec
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
setup_c0_status ST0_KX ST0_BEV
#else
setup_c0_status 0 ST0_BEV
@@ -185,7 +185,7 @@
* different layout ...
*/
page swapper_pg_dir, _PGD_ORDER
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
page invalid_pmd_table, _PMD_ORDER
#endif
page invalid_pte_table, _PTE_ORDER
diff -urN linux/arch/mips/kernel/mips_ksyms.c
linux/arch/mips/kernel/mips_ksyms.c
--- linux/arch/mips/kernel/mips_ksyms.c 2005/01/15 01:31:05 1.66
+++ linux/arch/mips/kernel/mips_ksyms.c 2005/07/14 12:05:05 1.67
@@ -35,7 +35,7 @@
EXPORT_SYMBOL(memmove);
EXPORT_SYMBOL(strcat);
EXPORT_SYMBOL(strchr);
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
EXPORT_SYMBOL(strncmp);
#endif
EXPORT_SYMBOL(strlen);
diff -urN linux/arch/mips/kernel/offset.c linux/arch/mips/kernel/offset.c
--- linux/arch/mips/kernel/offset.c 2005/05/31 11:49:19 1.18
+++ linux/arch/mips/kernel/offset.c 2005/07/14 12:05:05 1.19
@@ -241,7 +241,7 @@
linefeed;
}
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
void output_sc_defines(void)
{
text("/* Linux sigcontext offsets. */");
@@ -263,7 +263,7 @@
}
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
void output_sc_defines(void)
{
text("/* Linux sigcontext offsets. */");
diff -urN linux/arch/mips/kernel/process.c linux/arch/mips/kernel/process.c
--- linux/arch/mips/kernel/process.c 2005/07/11 20:46:28 1.81
+++ linux/arch/mips/kernel/process.c 2005/07/14 12:05:05 1.82
@@ -112,7 +112,7 @@
/* New thread loses kernel privileges. */
status = regs->cp0_status & ~(ST0_CU0|ST0_CU1|KU_MASK);
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
status &= ~ST0_FR;
status |= (current->thread.mflags & MF_32BIT_REGS) ? 0 : ST0_FR;
#endif
@@ -320,10 +320,10 @@
break;
if (
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
ip->i_format.opcode == sw_op &&
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
ip->i_format.opcode == sd_op &&
#endif
ip->i_format.rs == 29)
diff -urN linux/arch/mips/kernel/ptrace.c linux/arch/mips/kernel/ptrace.c
--- linux/arch/mips/kernel/ptrace.c 2005/06/30 09:42:00 1.65
+++ linux/arch/mips/kernel/ptrace.c 2005/07/14 12:05:05 1.66
@@ -126,7 +126,7 @@
if (tsk_used_math(child)) {
fpureg_t *fregs = get_fpu_regs(child);
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
/*
* The odd registers are actually the high
* order bits of the values stored in the even
@@ -137,7 +137,7 @@
else
tmp = (unsigned long) (fregs[(addr -
32)] & 0xffffffff);
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
tmp = fregs[addr - FPR_BASE];
#endif
} else {
@@ -239,7 +239,7 @@
sizeof(child->thread.fpu.hard));
child->thread.fpu.hard.fcr31 = 0;
}
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
/*
* The odd registers are actually the high order bits
* of the values stored in the even registers - unless
@@ -253,7 +253,7 @@
fregs[addr - FPR_BASE] |= data;
}
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
fregs[addr - FPR_BASE] = data;
#endif
break;
@@ -354,7 +354,7 @@
static inline int audit_arch(void)
{
int arch = EM_MIPS;
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
arch |= __AUDIT_ARCH_64BIT;
#endif
#if defined(__LITTLE_ENDIAN)
diff -urN linux/arch/mips/kernel/r4k_fpu.S linux/arch/mips/kernel/r4k_fpu.S
--- linux/arch/mips/kernel/r4k_fpu.S 2005/05/31 11:49:19 1.16
+++ linux/arch/mips/kernel/r4k_fpu.S 2005/07/14 12:05:05 1.17
@@ -36,7 +36,7 @@
LEAF(_save_fp_context)
cfc1 t1, fcr31
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/* Store the 16 odd double precision registers */
EX sdc1 $f1, SC_FPREGS+8(a0)
EX sdc1 $f3, SC_FPREGS+24(a0)
@@ -115,7 +115,7 @@
*/
LEAF(_restore_fp_context)
EX lw t0, SC_FPC_CSR(a0)
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
EX ldc1 $f1, SC_FPREGS+8(a0)
EX ldc1 $f3, SC_FPREGS+24(a0)
EX ldc1 $f5, SC_FPREGS+40(a0)
diff -urN linux/arch/mips/kernel/r4k_switch.S
linux/arch/mips/kernel/r4k_switch.S
--- linux/arch/mips/kernel/r4k_switch.S 2005/07/11 10:03:25 1.40
+++ linux/arch/mips/kernel/r4k_switch.S 2005/07/14 12:05:05 1.41
@@ -105,7 +105,7 @@
* Save a thread's fp context.
*/
LEAF(_save_fp)
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
mfc0 t1, CP0_STATUS
#endif
fpu_save_double a0 t1 t0 t2 # clobbers t1
@@ -142,7 +142,7 @@
li t1, -1 # SNaN
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
sll t0, t0, 5
bgez t0, 1f # 16 / 32 register mode?
diff -urN linux/arch/mips/kernel/setup.c linux/arch/mips/kernel/setup.c
--- linux/arch/mips/kernel/setup.c 2005/07/14 09:51:13 1.184
+++ linux/arch/mips/kernel/setup.c 2005/07/14 12:05:05 1.185
@@ -242,7 +242,7 @@
if (*tmp)
strcat(command_line, tmp);
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/* HACK: Guess if the sign extension was forgotten */
if (start > 0x0000000080000000 && start < 0x00000000ffffffff)
start |= 0xffffffff00000000;
@@ -447,7 +447,7 @@
{
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
* 64bit wide relocations for linker script symbols.
diff -urN linux/arch/mips/kernel/signal-common.h
linux/arch/mips/kernel/signal-common.h
--- linux/arch/mips/kernel/signal-common.h 2005/06/15 13:00:12 1.6
+++ linux/arch/mips/kernel/signal-common.h 2005/07/14 12:05:05 1.7
@@ -31,7 +31,7 @@
save_gp_reg(31);
#undef save_gp_reg
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
err |= __put_user(regs->hi, &sc->sc_mdhi);
err |= __put_user(regs->lo, &sc->sc_mdlo);
if (cpu_has_dsp) {
@@ -44,7 +44,7 @@
err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp);
}
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
err |= __put_user(regs->hi, &sc->sc_hi[0]);
err |= __put_user(regs->lo, &sc->sc_lo[0]);
if (cpu_has_dsp) {
@@ -92,7 +92,7 @@
current_thread_info()->restart_block.fn = do_no_restart_syscall;
err |= __get_user(regs->cp0_epc, &sc->sc_pc);
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
err |= __get_user(regs->hi, &sc->sc_mdhi);
err |= __get_user(regs->lo, &sc->sc_mdlo);
if (cpu_has_dsp) {
@@ -105,7 +105,7 @@
err |= __get_user(treg, &sc->sc_dsp); wrdsp(treg, DSP_MASK);
}
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
err |= __get_user(regs->hi, &sc->sc_hi[0]);
err |= __get_user(regs->lo, &sc->sc_lo[0]);
if (cpu_has_dsp) {
diff -urN linux/arch/mips/kernel/syscall.c linux/arch/mips/kernel/syscall.c
--- linux/arch/mips/kernel/syscall.c 2005/05/19 12:08:12 1.54
+++ linux/arch/mips/kernel/syscall.c 2005/07/14 12:05:05 1.55
@@ -184,7 +184,7 @@
if (!newsp)
newsp = regs.regs[29];
parent_tidptr = (int __user *) regs.regs[6];
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
/* We need to fetch the fifth argument off the stack. */
child_tidptr = NULL;
if (clone_flags & (CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID)) {
diff -urN linux/arch/mips/kernel/traps.c linux/arch/mips/kernel/traps.c
--- linux/arch/mips/kernel/traps.c 2005/07/14 07:36:25 1.219
+++ linux/arch/mips/kernel/traps.c 2005/07/14 12:05:05 1.220
@@ -1005,7 +1005,7 @@
* flag that some firmware may have left set and the TS bit (for
* 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;
#endif
if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV)
diff -urN linux/arch/mips/kernel/unaligned.c linux/arch/mips/kernel/unaligned.c
--- linux/arch/mips/kernel/unaligned.c 2005/03/17 21:50:49 1.38
+++ linux/arch/mips/kernel/unaligned.c 2005/07/14 12:05:05 1.39
@@ -240,7 +240,7 @@
break;
case lwu_op:
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/*
* 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
@@ -278,13 +278,13 @@
*newvalue = value;
*regptr = ®s->regs[insn.i_format.rt];
break;
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
/* Cannot handle 64-bit instructions in 32-bit kernel */
goto sigill;
case ld_op:
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/*
* 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
@@ -320,7 +320,7 @@
*newvalue = value;
*regptr = ®s->regs[insn.i_format.rt];
break;
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
/* Cannot handle 64-bit instructions in 32-bit kernel */
goto sigill;
@@ -392,7 +392,7 @@
break;
case sd_op:
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/*
* 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
@@ -428,7 +428,7 @@
if (res)
goto fault;
break;
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
/* Cannot handle 64-bit instructions in 32-bit kernel */
goto sigill;
diff -urN linux/arch/mips/lib/memcpy.S linux/arch/mips/lib/memcpy.S
--- linux/arch/mips/lib/memcpy.S 2005/07/11 10:03:27 1.19
+++ linux/arch/mips/lib/memcpy.S 2005/07/14 12:05:06 1.20
@@ -79,7 +79,7 @@
/*
* Only on the 64-bit kernel we can made use of 64-bit registers.
*/
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define USE_DOUBLE
#endif
diff -urN linux/arch/mips/math-emu/kernel_linkage.c
linux/arch/mips/math-emu/kernel_linkage.c
--- linux/arch/mips/math-emu/kernel_linkage.c 2005/05/11 11:00:36 1.11
+++ linux/arch/mips/math-emu/kernel_linkage.c 2005/07/14 12:05:06 1.12
@@ -82,7 +82,7 @@
return err;
}
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/*
* This is the o32 version
*/
diff -urN linux/arch/mips/mm/Makefile linux/arch/mips/mm/Makefile
--- linux/arch/mips/mm/Makefile 2005/07/06 12:08:14 1.76
+++ linux/arch/mips/mm/Makefile 2005/07/14 12:05:06 1.77
@@ -5,8 +5,8 @@
obj-y += cache.o extable.o fault.o init.o pgtable.o \
tlbex.o tlbex-fault.o
-obj-$(CONFIG_MIPS32) += ioremap.o pgtable-32.o
-obj-$(CONFIG_MIPS64) += pgtable-64.o
+obj-$(CONFIG_32BIT) += ioremap.o pgtable-32.o
+obj-$(CONFIG_64BIT) += pgtable-64.o
obj-$(CONFIG_HIGHMEM) += highmem.o
obj-$(CONFIG_CPU_MIPS32_R1) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
diff -urN linux/arch/mips/mm/c-r4k.c linux/arch/mips/mm/c-r4k.c
--- linux/arch/mips/mm/c-r4k.c 2005/07/13 11:49:02 1.111
+++ linux/arch/mips/mm/c-r4k.c 2005/07/14 12:05:06 1.112
@@ -734,10 +734,10 @@
".set push\n\t"
".set noat\n\t"
".set mips3\n\t"
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
"la $at,1f\n\t"
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
"dla $at,1f\n\t"
#endif
"cache %0,($at)\n\t"
diff -urN linux/arch/mips/mm/init.c linux/arch/mips/mm/init.c
--- linux/arch/mips/mm/init.c 2005/07/11 20:46:28 1.76
+++ linux/arch/mips/mm/init.c 2005/07/14 12:05:06 1.77
@@ -96,7 +96,7 @@
kmap_prot = PAGE_KERNEL;
}
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
void __init fixrange_init(unsigned long start, unsigned long end,
pgd_t *pgd_base)
{
@@ -131,7 +131,7 @@
j = 0;
}
}
-#endif /* CONFIG_MIPS32 */
+#endif /* CONFIG_32BIT */
#endif /* CONFIG_HIGHMEM */
#ifndef CONFIG_NEED_MULTIPLE_NODES
@@ -264,7 +264,7 @@
#ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end)
{
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/* Switch from KSEG0 to XKPHYS addresses */
start = (unsigned long)phys_to_virt(CPHYSADDR(start));
end = (unsigned long)phys_to_virt(CPHYSADDR(end));
@@ -292,7 +292,7 @@
addr = (unsigned long) &__init_begin;
while (addr < (unsigned long) &__init_end) {
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
page = PAGE_OFFSET | CPHYSADDR(addr);
#else
page = addr;
diff -urN linux/arch/mips/mm/pg-sb1.c linux/arch/mips/mm/pg-sb1.c
--- linux/arch/mips/mm/pg-sb1.c 2005/07/11 10:03:28 1.21
+++ linux/arch/mips/mm/pg-sb1.c 2005/07/14 12:05:06 1.22
@@ -116,7 +116,7 @@
" pref " SB1_PREF_STORE_STREAMED_HINT ", -64(%1)\n"
" pref " SB1_PREF_LOAD_STREAMED_HINT ", -32(%0)\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 $9, -120(%0) \n"
" ld $10, -112(%0) \n"
@@ -150,7 +150,7 @@
" daddiu %0, %0, -128 \n"
" daddiu %1, %1, -128 \n"
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
" ld $8, 0(%0) \n" /* Block copy a cacheline */
"1: ld $9, 8(%0) \n"
" ld $10, 16(%0) \n"
@@ -180,7 +180,7 @@
" daddiu %0, %0, 32 \n"
" daddiu %1, %1, 32 \n"
" bnel %0, %2, 1b \n"
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
" ld $8, 0(%0) \n"
#else
" lw $2, 0(%0) \n"
@@ -188,7 +188,7 @@
" .set pop \n"
: "+r" (src), "+r" (dst)
: "r" (end)
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
: "$8","$9","$10","$11","memory");
#else
: "$2","$3","$6","$7","$8","$9","$10","$11","memory");
diff -urN linux/arch/mips/mm/tlbex.c linux/arch/mips/mm/tlbex.c
--- linux/arch/mips/mm/tlbex.c 2005/07/12 16:12:05 1.29
+++ linux/arch/mips/mm/tlbex.c 2005/07/14 12:05:06 1.30
@@ -445,7 +445,7 @@
L_LA(_r3000_write_probe_fail)
/* 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_SW(buf, rs, rt, off) i_sd(buf, rs, rt, off)
# define i_SLL(buf, rs, rt, sh) i_dsll(buf, rs, rt, sh)
@@ -483,7 +483,7 @@
#define i_ssnop(buf) i_sll(buf, 0, 0, 1)
#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)
{
/* Is this address in 32bit compat space? */
@@ -513,7 +513,7 @@
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)) {
i_lui(buf, rs, rel_highest(addr));
if (rel_higher(addr))
@@ -679,7 +679,7 @@
#define C0_EPC 14
#define C0_XCONTEXT 20
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
# define GET_CONTEXT(buf, reg) i_MFC0(buf, reg, C0_XCONTEXT)
#else
# define GET_CONTEXT(buf, reg) i_MFC0(buf, reg, C0_CONTEXT)
@@ -928,7 +928,7 @@
}
}
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/*
* TMP and PTR are scratch.
* TMP will be clobbered, PTR will hold the pmd entry.
@@ -1010,7 +1010,7 @@
}
}
-#else /* !CONFIG_MIPS64 */
+#else /* !CONFIG_64BIT */
/*
* TMP and PTR are scratch.
@@ -1037,7 +1037,7 @@
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)
{
@@ -1158,7 +1158,7 @@
/* No need for i_nop */
}
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
#else
build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
@@ -1170,7 +1170,7 @@
l_leave(&l, p);
i_eret(&p); /* return from trap */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
build_get_pgd_vmalloc64(&p, &l, &r, K0, K1);
#endif
@@ -1181,7 +1181,7 @@
* need three, with the the second nop'ed and the third being
* unused.
*/
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
if ((p - tlb_handler) > 64)
panic("TLB refill handler space exceeded");
#else
@@ -1194,12 +1194,12 @@
/*
* Now fold the handler in the TLB refill handler space.
*/
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
f = final_handler;
/* Simplest case, just copy the handler. */
copy_handler(relocs, labels, tlb_handler, p, f);
final_len = p - tlb_handler;
-#else /* CONFIG_MIPS64 */
+#else /* CONFIG_64BIT */
f = final_handler + 32;
if ((p - tlb_handler) <= 32) {
/* Just copy the handler. */
@@ -1234,7 +1234,7 @@
copy_handler(relocs, labels, split, p, final_handler);
final_len = (f - (final_handler + 32)) + (p - split);
}
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
resolve_relocs(relocs, labels);
printk("Synthesized TLB refill handler (%u instructions).\n",
@@ -1245,12 +1245,12 @@
int i;
f = final_handler;
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
if (final_len > 32)
final_len = 64;
else
f = final_handler + 32;
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
for (i = 0; i < final_len; i++)
printk("%08x\n", f[i]);
}
@@ -1611,7 +1611,7 @@
struct reloc **r, unsigned int pte,
unsigned int ptr)
{
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */
#else
build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
@@ -1642,7 +1642,7 @@
l_leave(l, *p);
i_eret(p); /* return from trap */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
build_get_pgd_vmalloc64(p, l, r, tmp, ptr);
#endif
}
diff -urN linux/arch/mips/momentum/jaguar_atx/prom.c
linux/arch/mips/momentum/jaguar_atx/prom.c
--- linux/arch/mips/momentum/jaguar_atx/prom.c 2005/07/11 10:03:28 1.14
+++ linux/arch/mips/momentum/jaguar_atx/prom.c 2005/07/14 12:05:07 1.15
@@ -90,7 +90,7 @@
}
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
unsigned long signext(unsigned long addr)
{
@@ -143,7 +143,7 @@
return p;
}
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
/* PMON passes arguments in C main() style */
void __init prom_init(void)
@@ -158,7 +158,7 @@
// ja_setup_console(); /* The very first thing. */
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
char *ptr;
printk("Mips64 Jaguar-ATX\n");
@@ -201,7 +201,7 @@
}
printk("arcs_cmdline: %s\n", arcs_cmdline);
-#else /* CONFIG_MIPS64 */
+#else /* CONFIG_64BIT */
/* save the PROM vectors for debugging use */
debug_vectors = cv;
@@ -226,7 +226,7 @@
}
env++;
}
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_JAGUAR_ATX;
diff -urN linux/arch/mips/momentum/jaguar_atx/reset.c
linux/arch/mips/momentum/jaguar_atx/reset.c
--- linux/arch/mips/momentum/jaguar_atx/reset.c 2003/11/18 01:17:46 1.3
+++ linux/arch/mips/momentum/jaguar_atx/reset.c 2005/07/14 12:05:07 1.4
@@ -27,7 +27,7 @@
void momenco_jaguar_restart(char *command)
{
/* base address of timekeeper portion of part */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
void *nvram = (void*) 0xfffffffffc807000;
#else
void *nvram = (void*) 0xfc807000;
diff -urN linux/arch/mips/momentum/jaguar_atx/setup.c
linux/arch/mips/momentum/jaguar_atx/setup.c
--- linux/arch/mips/momentum/jaguar_atx/setup.c 2005/07/11 10:03:28 1.17
+++ linux/arch/mips/momentum/jaguar_atx/setup.c 2005/07/14 12:05:07 1.18
@@ -105,7 +105,7 @@
static __init void wire_stupidity_into_tlb(void)
{
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
write_c0_wired(0);
local_flush_tlb_all();
diff -urN linux/arch/mips/momentum/ocelot_3/prom.c
linux/arch/mips/momentum/ocelot_3/prom.c
--- linux/arch/mips/momentum/ocelot_3/prom.c 2004/12/04 18:16:00 1.3
+++ linux/arch/mips/momentum/ocelot_3/prom.c 2005/07/14 12:05:07 1.4
@@ -93,7 +93,7 @@
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
unsigned long signext(unsigned long addr)
{
@@ -145,7 +145,7 @@
return p;
}
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
void __init prom_init(void)
{
@@ -155,7 +155,7 @@
struct callvectors *cv = (struct callvectors *) fw_arg3;
int i;
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
char *ptr;
printk("prom_init - MIPS64\n");
@@ -198,7 +198,7 @@
}
printk("arcs_cmdline: %s\n", arcs_cmdline);
-#else /* CONFIG_MIPS64 */
+#else /* CONFIG_64BIT */
/* save the PROM vectors for debugging use */
debug_vectors = cv;
@@ -224,7 +224,7 @@
}
env++;
}
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_3;
@@ -234,7 +234,7 @@
get_mac(prom_mac_addr_base);
#endif
-#ifndef CONFIG_MIPS64
+#ifndef CONFIG_64BIT
debug_vectors->printf("Booting Linux kernel...\n");
#endif
}
diff -urN linux/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h
linux/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h
--- linux/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h 2003/11/18 01:17:46
1.4
+++ linux/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h 2005/07/14 12:05:07
1.5
@@ -32,7 +32,7 @@
#include <linux/config.h>
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define OCELOT_C_CS0_ADDR (0xfffffffffc000000)
#else
#define OCELOT_C_CS0_ADDR (0xfc000000)
diff -urN linux/arch/mips/momentum/ocelot_c/prom.c
linux/arch/mips/momentum/ocelot_c/prom.c
--- linux/arch/mips/momentum/ocelot_c/prom.c 2005/07/11 10:03:28 1.12
+++ linux/arch/mips/momentum/ocelot_c/prom.c 2005/07/14 12:05:07 1.13
@@ -94,7 +94,7 @@
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
unsigned long signext(unsigned long addr)
{
@@ -144,7 +144,7 @@
p = (char *)get_arg(args, arg_index);
return p;
}
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
void __init prom_init(void)
@@ -155,7 +155,7 @@
struct callvectors *cv = (struct callvectors *) fw_arg3;
int i;
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
char *ptr;
printk("prom_init - MIPS64\n");
@@ -197,7 +197,7 @@
}
printk("arcs_cmdline: %s\n", arcs_cmdline);
-#else /* CONFIG_MIPS64 */
+#else /* CONFIG_64BIT */
/* save the PROM vectors for debugging use */
debug_vectors = cv;
@@ -222,7 +222,7 @@
}
env++;
}
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_C;
@@ -232,7 +232,7 @@
get_mac(prom_mac_addr_base);
#endif
-#ifndef CONFIG_MIPS64
+#ifndef CONFIG_64BIT
debug_vectors->printf("Booting Linux kernel...\n");
#endif
}
diff -urN linux/arch/mips/momentum/ocelot_c/reset.c
linux/arch/mips/momentum/ocelot_c/reset.c
--- linux/arch/mips/momentum/ocelot_c/reset.c 2003/11/18 01:17:46 1.4
+++ linux/arch/mips/momentum/ocelot_c/reset.c 2005/07/14 12:05:07 1.5
@@ -28,7 +28,7 @@
{
/* base address of timekeeper portion of part */
void *nvram = (void *)
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
0xfffffffffc807000;
#else
0xfc807000;
diff -urN linux/arch/mips/momentum/ocelot_c/setup.c
linux/arch/mips/momentum/ocelot_c/setup.c
--- linux/arch/mips/momentum/ocelot_c/setup.c 2005/06/21 13:56:31 1.20
+++ linux/arch/mips/momentum/ocelot_c/setup.c 2005/07/14 12:05:07 1.21
@@ -109,7 +109,7 @@
*/
printk("PMON_v2_setup\n");
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/* marvell and extra space */
add_wired_entry(ENTRYLO(0xf4000000), ENTRYLO(0xf4010000),
0xfffffffff4000000, PM_64K);
/* fpga, rtc, and uart */
@@ -134,7 +134,7 @@
unsigned long m48t37y_get_time(void)
{
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
unsigned char *rtc_base = (unsigned char*)0xfffffffffc800000;
#else
unsigned char* rtc_base = (unsigned char*)0xfc800000;
@@ -163,7 +163,7 @@
int m48t37y_set_time(unsigned long sec)
{
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
unsigned char* rtc_base = (unsigned char*)0xfffffffffc800000;
#else
unsigned char* rtc_base = (unsigned char*)0xfc800000;
@@ -340,7 +340,7 @@
}
}
-#ifndef CONFIG_MIPS64
+#ifndef CONFIG_64BIT
/* This needs to be one of the first initcalls, because no I/O port access
can work before this */
static int io_base_ioremap(void)
diff -urN linux/arch/mips/pci/pci-ip32.c linux/arch/mips/pci/pci-ip32.c
--- linux/arch/mips/pci/pci-ip32.c 2005/02/19 13:58:37 1.14
+++ linux/arch/mips/pci/pci-ip32.c 2005/07/14 12:05:07 1.15
@@ -84,7 +84,7 @@
extern struct pci_ops mace_pci_ops;
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
static struct resource mace_pci_mem_resource = {
.name = "SGI O2 PCI MEM",
.start = MACEPCI_HI_MEMORY,
diff -urN linux/arch/mips/sibyte/cfe/setup.c linux/arch/mips/sibyte/cfe/setup.c
--- linux/arch/mips/sibyte/cfe/setup.c 2005/07/11 10:03:30 1.21
+++ linux/arch/mips/sibyte/cfe/setup.c 2005/07/14 12:05:07 1.22
@@ -33,7 +33,7 @@
#include "cfe_error.h"
/* Max ram addressable in 32-bit segments */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define MAX_RAM_SIZE (~0ULL)
#else
#ifdef CONFIG_HIGHMEM
diff -urN linux/arch/mips/sibyte/swarm/setup.c
linux/arch/mips/sibyte/swarm/setup.c
--- linux/arch/mips/sibyte/swarm/setup.c 2005/07/11 10:03:31 1.37
+++ linux/arch/mips/sibyte/swarm/setup.c 2005/07/14 12:05:08 1.38
@@ -73,7 +73,7 @@
{
if (!is_fixup && (regs->cp0_cause & 4)) {
/* Data bus error - print PA */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
printk("DBE physical address: %010lx\n",
__read_64bit_c0_register($26, 1));
#else
diff -urN linux/drivers/net/titan_ge.h linux/drivers/net/titan_ge.h
--- linux/drivers/net/titan_ge.h 2005/04/14 12:47:15 1.19
+++ linux/drivers/net/titan_ge.h 2005/07/14 12:05:08 1.20
@@ -103,7 +103,7 @@
/* Keep the rings in the Titan's SSRAM */
#define TITAN_RX_RING_IN_SRAM
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define TITAN_GE_IE_MASK 0xfffffffffb001b64
#define TITAN_GE_IE_STATUS 0xfffffffffb001b60
#else
diff -urN linux/include/asm-mips/a.out.h linux/include/asm-mips/a.out.h
--- linux/include/asm-mips/a.out.h 2003/07/29 03:21:47 1.2
+++ linux/include/asm-mips/a.out.h 2005/07/14 12:05:08 1.3
@@ -35,10 +35,10 @@
#ifdef __KERNEL__
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define STACK_TOP TASK_SIZE
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define STACK_TOP (current->thread.mflags & MF_32BIT_ADDR ? TASK_SIZE32 :
TASK_SIZE)
#endif
diff -urN linux/include/asm-mips/addrspace.h linux/include/asm-mips/addrspace.h
--- linux/include/asm-mips/addrspace.h 2005/07/06 12:08:14 1.17
+++ linux/include/asm-mips/addrspace.h 2005/07/14 12:05:08 1.18
@@ -51,7 +51,7 @@
#define XPHYSADDR(a) ((_ACAST64_(a)) & \
_LLCONST_(0x000000ffffffffff))
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/*
* Memory segments (64bit kernel mode addresses)
diff -urN linux/include/asm-mips/asmmacro.h linux/include/asm-mips/asmmacro.h
--- linux/include/asm-mips/asmmacro.h 2005/07/11 10:03:32 1.15
+++ linux/include/asm-mips/asmmacro.h 2005/07/14 12:05:08 1.16
@@ -11,10 +11,10 @@
#include <linux/config.h>
#include <asm/hazards.h>
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#include <asm/asmmacro-32.h>
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#include <asm/asmmacro-64.h>
#endif
diff -urN linux/include/asm-mips/atomic.h linux/include/asm-mips/atomic.h
--- linux/include/asm-mips/atomic.h 2005/06/23 15:57:18 1.40
+++ linux/include/asm-mips/atomic.h 2005/07/14 12:05:08 1.41
@@ -354,7 +354,7 @@
*/
#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;
@@ -679,7 +679,7 @@
*/
#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
diff -urN linux/include/asm-mips/bitops.h linux/include/asm-mips/bitops.h
--- linux/include/asm-mips/bitops.h 2005/07/13 10:01:59 1.63
+++ linux/include/asm-mips/bitops.h 2005/07/14 12:05:08 1.64
@@ -600,14 +600,14 @@
#else
int b = 0, s;
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
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 = 4; if (word << 28 != 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;
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
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 = 8; if (word << 56 != 0) s = 0; b += s; word >>= s;
@@ -658,7 +658,7 @@
#if defined(CONFIG_CPU_MIPS32_R1) || defined(CONFIG_CPU_MIPS64_R1)
return __ilog2(~word);
#else
-#if defined(CONFIG_MIPS32)
+#if defined(CONFIG_32BIT)
int r = 31, s;
word = ~word;
s = 16; if ((word & 0xffff0000)) s = 0; r -= s; word <<= s;
@@ -667,7 +667,7 @@
s = 2; if ((word & 0xc0000000)) s = 0; r -= s; word <<= s;
s = 1; if ((word & 0x80000000)) s = 0; r -= s;
#endif
-#if defined(CONFIG_MIPS64)
+#if defined(CONFIG_64BIT)
int r = 63, s;
word = ~word;
s = 32; if ((word & 0xffffffff00000000)) s = 0; r -= s; word <<= s;
@@ -811,7 +811,7 @@
*/
static inline int sched_find_first_bit(const unsigned long *b)
{
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
if (unlikely(b[0]))
return __ffs(b[0]);
if (unlikely(b[1]))
@@ -822,7 +822,7 @@
return __ffs(b[3]) + 96;
return __ffs(b[4]) + 128;
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
if (unlikely(b[0]))
return __ffs(b[0]);
if (unlikely(b[1]))
diff -urN linux/include/asm-mips/bugs.h linux/include/asm-mips/bugs.h
--- linux/include/asm-mips/bugs.h 2005/04/13 17:36:49 1.12
+++ linux/include/asm-mips/bugs.h 2005/07/14 12:05:08 1.13
@@ -21,7 +21,7 @@
cpu_data[cpu].udelay_val = loops_per_jiffy;
check_bugs32();
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
check_bugs64();
#endif
}
diff -urN linux/include/asm-mips/checksum.h linux/include/asm-mips/checksum.h
--- linux/include/asm-mips/checksum.h 2005/07/08 09:17:05 1.29
+++ linux/include/asm-mips/checksum.h 2005/07/14 12:05:08 1.30
@@ -130,7 +130,7 @@
__asm__(
" .set push # csum_tcpudp_nofold\n"
" .set noat \n"
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
" addu %0, %2 \n"
" sltu $1, %0, %2 \n"
" addu %0, $1 \n"
@@ -143,7 +143,7 @@
" sltu $1, %0, %4 \n"
" addu %0, $1 \n"
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
" daddu %0, %2 \n"
" daddu %0, %3 \n"
" daddu %0, %4 \n"
diff -urN linux/include/asm-mips/cpu-features.h
linux/include/asm-mips/cpu-features.h
--- linux/include/asm-mips/cpu-features.h 2005/07/14 07:34:18 1.14
+++ linux/include/asm-mips/cpu-features.h 2005/07/14 12:05:09 1.15
@@ -109,7 +109,7 @@
#define cpu_has_dsp (cpu_data[0].ases & MIPS_ASE_DSP)
#endif
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
# ifndef cpu_has_nofpuex
# define cpu_has_nofpuex (cpu_data[0].options & MIPS_CPU_NOFPUEX)
# endif
@@ -130,7 +130,7 @@
# define cpu_has_mipsmt (cpu_data[0].ases & MIPS_CPU_MIPSMT)
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
# ifndef cpu_has_nofpuex
# define cpu_has_nofpuex 0
# endif
diff -urN linux/include/asm-mips/delay.h linux/include/asm-mips/delay.h
--- linux/include/asm-mips/delay.h 2005/04/18 10:40:09 1.18
+++ linux/include/asm-mips/delay.h 2005/07/14 12:05:09 1.19
@@ -55,11 +55,11 @@
* The common rates of 1000 and 128 are rounded wrongly by the
* 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) */
-#elif defined(CONFIG_MIPS64) && (HZ == 1000)
+#elif defined(CONFIG_64BIT) && (HZ == 1000)
usecs *= 0x004189374BC6A7f0UL; /* 2**64 / (1000000 / HZ) */
-#elif defined(CONFIG_MIPS64)
+#elif defined(CONFIG_64BIT)
usecs *= (0x8000000000000000UL / (500000 / HZ));
#else /* 32-bit junk follows here */
usecs *= (unsigned long) (((0x8000000000000000ULL / (500000 / HZ)) +
diff -urN linux/include/asm-mips/elf.h linux/include/asm-mips/elf.h
--- linux/include/asm-mips/elf.h 2005/07/13 17:58:20 1.30
+++ linux/include/asm-mips/elf.h 2005/07/14 12:05:09 1.31
@@ -133,7 +133,7 @@
typedef double elf_fpreg_t;
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.
@@ -161,9 +161,9 @@
*/
#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.
*/
@@ -185,7 +185,7 @@
*/
#define ELF_CLASS ELFCLASS64
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
/*
* These are used to set parameters in the core dumps.
@@ -207,7 +207,7 @@
extern struct mips_abi mips_abi_32;
extern struct mips_abi mips_abi_n32;
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define SET_PERSONALITY(ex, ibcs2) \
do { \
@@ -218,9 +218,9 @@
current->thread.abi = &mips_abi; \
} while (0)
-#endif /* CONFIG_MIPS32 */
+#endif /* CONFIG_32BIT */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#ifdef CONFIG_MIPS32_N32
#define __SET_PERSONALITY32_N32() \
@@ -273,7 +273,7 @@
set_personality(PER_LINUX); \
} while (0)
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
extern void dump_regs(elf_greg_t *, struct pt_regs *regs);
extern int dump_task_regs (struct task_struct *, elf_gregset_t *);
diff -urN linux/include/asm-mips/local.h linux/include/asm-mips/local.h
--- linux/include/asm-mips/local.h 2003/08/26 00:28:59 1.2
+++ linux/include/asm-mips/local.h 2005/07/14 12:05:09 1.3
@@ -5,7 +5,7 @@
#include <linux/percpu.h>
#include <asm/atomic.h>
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
typedef atomic_t local_t;
@@ -20,7 +20,7 @@
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
typedef atomic64_t local_t;
diff -urN linux/include/asm-mips/mmu_context.h
linux/include/asm-mips/mmu_context.h
--- linux/include/asm-mips/mmu_context.h 2005/04/01 14:07:13 1.49
+++ linux/include/asm-mips/mmu_context.h 2005/07/14 12:05:09 1.50
@@ -28,17 +28,17 @@
#define TLBMISS_HANDLER_SETUP_PGD(pgd) \
pgd_current[smp_processor_id()] = (unsigned long)(pgd)
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define TLBMISS_HANDLER_SETUP()
\
write_c0_context((unsigned long) smp_processor_id() << 25); \
TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
#endif
-#if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64)
+#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
#define TLBMISS_HANDLER_SETUP()
\
write_c0_context((unsigned long) &pgd_current[smp_processor_id()] <<
23); \
TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
#endif
-#if defined(CONFIG_MIPS64) && defined(CONFIG_BUILD_ELF64)
+#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
#define TLBMISS_HANDLER_SETUP()
\
write_c0_context((unsigned long) smp_processor_id() << 26); \
TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
diff -urN linux/include/asm-mips/module.h linux/include/asm-mips/module.h
--- linux/include/asm-mips/module.h 2005/02/21 10:45:09 1.8
+++ linux/include/asm-mips/module.h 2005/07/14 12:05:09 1.9
@@ -33,7 +33,7 @@
Elf64_Sxword r_addend; /* Addend. */
} Elf64_Mips_Rela;
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define Elf_Shdr Elf32_Shdr
#define Elf_Sym Elf32_Sym
@@ -48,7 +48,7 @@
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define Elf_Shdr Elf64_Shdr
#define Elf_Sym Elf64_Sym
diff -urN linux/include/asm-mips/msgbuf.h linux/include/asm-mips/msgbuf.h
--- linux/include/asm-mips/msgbuf.h 2003/10/07 23:18:08 1.4
+++ linux/include/asm-mips/msgbuf.h 2005/07/14 12:05:09 1.5
@@ -15,25 +15,25 @@
struct msqid64_ds {
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;
#endif
__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;
#endif
-#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if defined(CONFIG_32BIT) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused2;
#endif
__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;
#endif
-#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if defined(CONFIG_32BIT) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused3;
#endif
__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;
#endif
unsigned long msg_cbytes; /* current number of bytes on queue */
diff -urN linux/include/asm-mips/paccess.h linux/include/asm-mips/paccess.h
--- linux/include/asm-mips/paccess.h 2005/03/04 19:36:53 1.5
+++ linux/include/asm-mips/paccess.h 2005/07/14 12:05:09 1.6
@@ -16,10 +16,10 @@
#include <linux/config.h>
#include <linux/errno.h>
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define __PA_ADDR ".word"
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define __PA_ADDR ".dword"
#endif
diff -urN linux/include/asm-mips/page.h linux/include/asm-mips/page.h
--- linux/include/asm-mips/page.h 2005/07/11 20:48:37 1.48
+++ linux/include/asm-mips/page.h 2005/07/14 12:05:09 1.49
@@ -93,7 +93,7 @@
* For 3-level pagetables we defines these ourselves, for 2-level the
* definitions are supplied by <asm-generic/pgtable-nopmd.h>.
*/
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
typedef struct { unsigned long pmd; } pmd_t;
#define pmd_val(x) ((x).pmd)
diff -urN linux/include/asm-mips/pgalloc.h linux/include/asm-mips/pgalloc.h
--- linux/include/asm-mips/pgalloc.h 2005/02/10 12:19:59 1.33
+++ linux/include/asm-mips/pgalloc.h 2005/07/14 12:05:09 1.34
@@ -30,7 +30,7 @@
*/
extern void pmd_init(unsigned long page, unsigned long pagetable);
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
{
@@ -97,7 +97,7 @@
#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
/*
* allocating and freeing a pmd is trivial: the 1-entry pmd is
@@ -108,7 +108,7 @@
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
{
diff -urN linux/include/asm-mips/pgtable.h linux/include/asm-mips/pgtable.h
--- linux/include/asm-mips/pgtable.h 2005/07/14 00:17:05 1.107
+++ linux/include/asm-mips/pgtable.h 2005/07/14 12:05:09 1.108
@@ -9,10 +9,10 @@
#define _ASM_PGTABLE_H
#include <linux/config.h>
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#include <asm/pgtable-32.h>
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#include <asm/pgtable-64.h>
#endif
@@ -150,7 +150,7 @@
*/
#define set_pmd(pmdptr, pmdval) do { *(pmdptr) = (pmdval); } while(0)
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/*
* (puds are folded into pgds so this doesn't get actually called,
* but the define is needed for a generic inline function.)
diff -urN linux/include/asm-mips/processor.h linux/include/asm-mips/processor.h
--- linux/include/asm-mips/processor.h 2005/05/31 11:49:19 1.99
+++ linux/include/asm-mips/processor.h 2005/07/14 12:05:09 1.100
@@ -33,7 +33,7 @@
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,
* so don't change it unless you know what you are doing.
@@ -47,7 +47,7 @@
#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/*
* 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
diff -urN linux/include/asm-mips/ptrace.h linux/include/asm-mips/ptrace.h
--- linux/include/asm-mips/ptrace.h 2005/05/31 11:49:19 1.25
+++ linux/include/asm-mips/ptrace.h 2005/07/14 12:05:09 1.26
@@ -30,7 +30,7 @@
* system call/exception. As usual the registers k0/k1 aren't being saved.
*/
struct pt_regs {
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
/* Pad bytes for argument save space on the stack. */
unsigned long pad0[6];
#endif
diff -urN linux/include/asm-mips/reg.h linux/include/asm-mips/reg.h
--- linux/include/asm-mips/reg.h 2005/01/26 02:21:06 1.5
+++ linux/include/asm-mips/reg.h 2005/07/14 12:05:09 1.6
@@ -14,7 +14,7 @@
#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_R1 7
@@ -70,7 +70,7 @@
#endif
-#if CONFIG_MIPS64
+#if CONFIG_64BIT
#define EF_R0 0
#define EF_R1 1
@@ -124,6 +124,6 @@
#define EF_SIZE 304 /* size in bytes */
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
#endif /* __ASM_MIPS_REG_H */
diff -urN linux/include/asm-mips/resource.h linux/include/asm-mips/resource.h
--- linux/include/asm-mips/resource.h 2005/03/18 17:38:08 1.15
+++ linux/include/asm-mips/resource.h 2005/07/14 12:05:09 1.16
@@ -27,7 +27,7 @@
* but we keep the old value on MIPS32,
* for compatibility:
*/
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
# define RLIM_INFINITY 0x7fffffffUL
#endif
diff -urN linux/include/asm-mips/sgiarcs.h linux/include/asm-mips/sgiarcs.h
--- linux/include/asm-mips/sgiarcs.h 2004/10/20 23:46:00 1.14
+++ linux/include/asm-mips/sgiarcs.h 2005/07/14 12:05:09 1.15
@@ -367,7 +367,7 @@
* Macros for calling a 32-bit ARC implementation from 64-bit code
*/
-#if defined(CONFIG_MIPS64) && defined(CONFIG_ARC32)
+#if defined(CONFIG_64BIT) && defined(CONFIG_ARC32)
#define __arc_clobbers \
"$2","$3" /* ... */, "$8","$9","$10","$11", \
@@ -476,10 +476,10 @@
__res; \
})
-#endif /* defined(CONFIG_MIPS64) && defined(CONFIG_ARC32) */
+#endif /* defined(CONFIG_64BIT) && defined(CONFIG_ARC32) */
-#if (defined(CONFIG_MIPS32) && defined(CONFIG_ARC32)) || \
- (defined(CONFIG_MIPS64) && defined(CONFIG_ARC64))
+#if (defined(CONFIG_32BIT) && defined(CONFIG_ARC32)) || \
+ (defined(CONFIG_64BIT) && defined(CONFIG_ARC64))
#define ARC_CALL0(dest)
\
({ long __res; \
diff -urN linux/include/asm-mips/siginfo.h linux/include/asm-mips/siginfo.h
--- linux/include/asm-mips/siginfo.h 2005/05/19 12:08:42 1.25
+++ linux/include/asm-mips/siginfo.h 2005/07/14 12:05:09 1.26
@@ -26,10 +26,10 @@
/*
* Careful to keep union _sifields from shifting ...
*/
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
#endif
diff -urN linux/include/asm-mips/sim.h linux/include/asm-mips/sim.h
--- linux/include/asm-mips/sim.h 2004/09/16 22:44:21 1.4
+++ linux/include/asm-mips/sim.h 2005/07/14 12:05:09 1.5
@@ -16,7 +16,7 @@
#define __str2(x) #x
#define __str(x) __str2(x)
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define save_static_function(symbol) \
__asm__ ( \
@@ -42,9 +42,9 @@
#define nabi_no_regargs
-#endif /* CONFIG_MIPS32 */
+#endif /* CONFIG_32BIT */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define save_static_function(symbol) \
__asm__ ( \
@@ -78,6 +78,6 @@
unsigned long __dummy6, \
unsigned long __dummy7,
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
#endif /* _ASM_SIM_H */
diff -urN linux/include/asm-mips/stackframe.h
linux/include/asm-mips/stackframe.h
--- linux/include/asm-mips/stackframe.h 2005/07/08 08:03:48 1.38
+++ linux/include/asm-mips/stackframe.h 2005/07/14 12:05:09 1.39
@@ -26,7 +26,7 @@
.macro SAVE_TEMP
mfhi v1
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
LONG_S $8, PT_R8(sp)
LONG_S $9, PT_R9(sp)
#endif
@@ -56,14 +56,14 @@
#ifdef CONFIG_SMP
.macro get_saved_sp /* SMP variation */
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
mfc0 k0, CP0_CONTEXT
lui k1, %hi(kernelsp)
srl k0, k0, 23
addu k1, k0
LONG_L k1, %lo(kernelsp)(k1)
#endif
-#if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64)
+#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
MFC0 k1, CP0_CONTEXT
dsra k1, 23
lui k0, %hi(pgd_current)
@@ -73,7 +73,7 @@
daddu k1, k0
LONG_L k1, %lo(kernelsp)(k1)
#endif
-#if defined(CONFIG_MIPS64) && defined(CONFIG_BUILD_ELF64)
+#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
MFC0 k1, CP0_CONTEXT
lui k0, %highest(kernelsp)
dsrl k1, 23
@@ -87,15 +87,15 @@
.endm
.macro set_saved_sp stackp temp temp2
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
mfc0 \temp, CP0_CONTEXT
srl \temp, 23
#endif
-#if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64)
+#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
lw \temp, TI_CPU(gp)
dsll \temp, 3
#endif
-#if defined(CONFIG_MIPS64) && defined(CONFIG_BUILD_ELF64)
+#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
MFC0 \temp, CP0_CONTEXT
dsrl \temp, 23
#endif
@@ -103,7 +103,7 @@
.endm
#else
.macro get_saved_sp /* Uniprocessor variation */
-#if defined(CONFIG_MIPS64) && defined(CONFIG_BUILD_ELF64)
+#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
lui k1, %highest(kernelsp)
daddiu k1, %higher(kernelsp)
dsll k1, k1, 16
@@ -147,7 +147,7 @@
LONG_S $6, PT_R6(sp)
MFC0 v1, CP0_EPC
LONG_S $7, PT_R7(sp)
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
LONG_S $8, PT_R8(sp)
LONG_S $9, PT_R9(sp)
#endif
@@ -176,7 +176,7 @@
.macro RESTORE_TEMP
LONG_L $24, PT_LO(sp)
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
LONG_L $8, PT_R8(sp)
LONG_L $9, PT_R9(sp)
#endif
@@ -224,7 +224,7 @@
LONG_L $31, PT_R31(sp)
LONG_L $28, PT_R28(sp)
LONG_L $25, PT_R25(sp)
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
LONG_L $8, PT_R8(sp)
LONG_L $9, PT_R9(sp)
#endif
@@ -269,7 +269,7 @@
LONG_L $31, PT_R31(sp)
LONG_L $28, PT_R28(sp)
LONG_L $25, PT_R25(sp)
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
LONG_L $8, PT_R8(sp)
LONG_L $9, PT_R9(sp)
#endif
diff -urN linux/include/asm-mips/string.h linux/include/asm-mips/string.h
--- linux/include/asm-mips/string.h 2005/02/07 02:55:00 1.26
+++ linux/include/asm-mips/string.h 2005/07/14 12:05:09 1.27
@@ -16,7 +16,7 @@
* Most of the inline functions are rather naive implementations so I just
* didn't bother updating them for 64-bit ...
*/
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#ifndef IN_STRING_C
@@ -130,7 +130,7 @@
return __res;
}
-#endif /* CONFIG_MIPS32 */
+#endif /* CONFIG_32BIT */
#define __HAVE_ARCH_MEMSET
extern void *memset(void *__s, int __c, size_t __count);
@@ -141,7 +141,7 @@
#define __HAVE_ARCH_MEMMOVE
extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define __HAVE_ARCH_MEMSCAN
static __inline__ void *memscan(void *__addr, int __c, size_t __size)
{
@@ -161,6 +161,6 @@
return __addr;
}
-#endif /* CONFIG_MIPS32 */
+#endif /* CONFIG_32BIT */
#endif /* _ASM_STRING_H */
diff -urN linux/include/asm-mips/system.h linux/include/asm-mips/system.h
--- linux/include/asm-mips/system.h 2005/07/11 20:48:37 1.87
+++ linux/include/asm-mips/system.h 2005/07/14 12:05:09 1.88
@@ -221,7 +221,7 @@
return retval;
}
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val)
{
__u64 retval;
@@ -351,7 +351,7 @@
return retval;
}
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old,
unsigned long new)
{
diff -urN linux/include/asm-mips/thread_info.h
linux/include/asm-mips/thread_info.h
--- linux/include/asm-mips/thread_info.h 2005/07/11 20:48:37 1.22
+++ linux/include/asm-mips/thread_info.h 2005/07/14 12:05:09 1.23
@@ -63,10 +63,10 @@
#define current_thread_info() __current_thread_info
/* thread information allocation */
-#if defined(CONFIG_PAGE_SIZE_4KB) && defined(CONFIG_MIPS32)
+#if defined(CONFIG_PAGE_SIZE_4KB) && defined(CONFIG_32BIT)
#define THREAD_SIZE_ORDER (1)
#endif
-#if defined(CONFIG_PAGE_SIZE_4KB) && defined(CONFIG_MIPS64)
+#if defined(CONFIG_PAGE_SIZE_4KB) && defined(CONFIG_64BIT)
#define THREAD_SIZE_ORDER (2)
#endif
#ifdef CONFIG_PAGE_SIZE_8KB
diff -urN linux/include/asm-mips/types.h linux/include/asm-mips/types.h
--- linux/include/asm-mips/types.h 2004/06/06 02:12:54 1.16
+++ linux/include/asm-mips/types.h 2005/07/14 12:05:09 1.17
@@ -78,7 +78,7 @@
#endif
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
- || defined(CONFIG_MIPS64)
+ || defined(CONFIG_64BIT)
typedef u64 dma_addr_t;
#else
typedef u32 dma_addr_t;
diff -urN linux/include/asm-mips/uaccess.h linux/include/asm-mips/uaccess.h
--- linux/include/asm-mips/uaccess.h 2005/03/18 17:38:08 1.46
+++ linux/include/asm-mips/uaccess.h 2005/07/14 12:05:09 1.47
@@ -22,7 +22,7 @@
*
* For historical reasons, these macros are grossly misnamed.
*/
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define __UA_LIMIT 0x80000000UL
@@ -32,9 +32,9 @@
#define __UA_t0 "$8"
#define __UA_t1 "$9"
-#endif /* CONFIG_MIPS32 */
+#endif /* CONFIG_32BIT */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define __UA_LIMIT (- TASK_SIZE)
@@ -44,7 +44,7 @@
#define __UA_t0 "$12"
#define __UA_t1 "$13"
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
/*
* USER_DS is a bitmask that has the bits set that may not be set in a valid
diff -urN linux/include/asm-mips/unistd.h linux/include/asm-mips/unistd.h
--- linux/include/asm-mips/unistd.h 2005/07/13 11:50:12 1.75
+++ linux/include/asm-mips/unistd.h 2005/07/14 12:05:09 1.76
@@ -1137,7 +1137,7 @@
# ifndef __mips64
# define __ARCH_WANT_STAT64
# endif
-# ifdef CONFIG_MIPS32
+# ifdef CONFIG_32BIT
# define __ARCH_WANT_SYS_TIME
# endif
# ifdef CONFIG_MIPS32_O32
diff -urN linux/include/asm-mips/dec/prom.h linux/include/asm-mips/dec/prom.h
--- linux/include/asm-mips/dec/prom.h 2005/06/16 20:35:48 1.7
+++ linux/include/asm-mips/dec/prom.h 2005/07/14 12:05:10 1.8
@@ -48,15 +48,15 @@
*/
#define REX_PROM_MAGIC 0x30464354
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#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)
-#endif /* !CONFIG_MIPS64 */
+#endif /* !CONFIG_64BIT */
/*
@@ -105,7 +105,7 @@
extern int (*__pmax_close)(int);
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/*
* On MIPS64 we have to call PROM functions via a helper
@@ -140,7 +140,7 @@
#define prom_getenv(x) _prom_getenv(__prom_getenv, 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.
@@ -162,7 +162,7 @@
#define pmax_read __pmax_read
#define pmax_close __pmax_close
-#endif /* !CONFIG_MIPS64 */
+#endif /* !CONFIG_64BIT */
extern void prom_meminit(u32);
diff -urN linux/include/asm-mips/mach-generic/spaces.h
linux/include/asm-mips/mach-generic/spaces.h
--- linux/include/asm-mips/mach-generic/spaces.h 2004/10/15 02:08:49
1.6
+++ linux/include/asm-mips/mach-generic/spaces.h 2005/07/14 12:05:10
1.7
@@ -12,7 +12,7 @@
#include <linux/config.h>
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define CAC_BASE 0x80000000
#define IO_BASE 0xa0000000
@@ -32,9 +32,9 @@
#define HIGHMEM_START 0x20000000UL
#endif
-#endif /* CONFIG_MIPS32 */
+#endif /* CONFIG_32BIT */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
/*
* This handles the memory map.
@@ -67,6 +67,6 @@
#define TO_CAC(x) (CAC_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 */
diff -urN linux/include/asm-mips/mach-ip22/spaces.h
linux/include/asm-mips/mach-ip22/spaces.h
--- linux/include/asm-mips/mach-ip22/spaces.h 2004/10/15 02:08:49 1.2
+++ linux/include/asm-mips/mach-ip22/spaces.h 2005/07/14 12:05:11 1.3
@@ -12,7 +12,7 @@
#include <linux/config.h>
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
#define CAC_BASE 0x80000000
#define IO_BASE 0xa0000000
@@ -32,9 +32,9 @@
#define HIGHMEM_START 0x20000000UL
#endif
-#endif /* CONFIG_MIPS32 */
+#endif /* CONFIG_32BIT */
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
#define PAGE_OFFSET 0xffffffff80000000UL
#ifndef HIGHMEM_START
@@ -50,6 +50,6 @@
#define TO_CAC(x) (CAC_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 */
diff -urN linux/include/asm-mips/mach-ip32/cpu-feature-overrides.h
linux/include/asm-mips/mach-ip32/cpu-feature-overrides.h
--- linux/include/asm-mips/mach-ip32/cpu-feature-overrides.h 2005/05/31
11:49:20 1.4
+++ linux/include/asm-mips/mach-ip32/cpu-feature-overrides.h 2005/07/14
12:05:11 1.5
@@ -18,7 +18,7 @@
* so, for 64bit IP32 kernel we just don't use ll/sc.
* 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
#else
#define cpu_has_llsc 1
|