aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/mips/Makefile13
-rw-r--r--arch/mips/configs/bigsur_defconfig102
-rw-r--r--arch/mips/jazz/setup.c2
-rw-r--r--arch/mips/kernel/smp.c2
-rw-r--r--arch/mips/sgi-ip27/ip27-klnuma.c2
-rw-r--r--arch/mips/sibyte/bcm1480/smp.c6
-rw-r--r--include/asm-mips/irq.h2
-rw-r--r--include/asm-mips/stackframe.h64
-rw-r--r--include/asm-mips/termbits.h12
9 files changed, 120 insertions, 85 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 2124350ab94d..641aa30b3638 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -91,8 +91,17 @@ cflags-y += -ffreestanding
91# carefully avoid to add it redundantly because gcc 3.3/3.4 complains 91# carefully avoid to add it redundantly because gcc 3.3/3.4 complains
92# when fed the toolchain default! 92# when fed the toolchain default!
93# 93#
94cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB -D__MIPSEB__) 94# Certain gcc versions upto gcc 4.1.1 (probably 4.2-subversion as of
95cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL -D__MIPSEL__) 95# 2006-10-10 don't properly change the the predefined symbols if -EB / -EL
96# are used, so we kludge that here. A bug has been filed at
97# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413.
98#
99undef-all += -UMIPSEB -U_MIPSEB -U__MIPSEB -U__MIPSEB__
100undef-all += -UMIPSEL -U_MIPSEL -U__MIPSEL -U__MIPSEL__
101predef-be += -DMIPSEB -D_MIPSEB -D__MIPSEB -D__MIPSEB__
102predef-le += -DMIPSEL -D_MIPSEL -D__MIPSEL -D__MIPSEL__
103cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB $(undef-all) $(predef-be))
104cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL $(undef-all) $(predef-le))
96 105
97cflags-$(CONFIG_SB1XXX_CORELIS) += $(call cc-option,-mno-sched-prolog) \ 106cflags-$(CONFIG_SB1XXX_CORELIS) += $(call cc-option,-mno-sched-prolog) \
98 -fno-omit-frame-pointer 107 -fno-omit-frame-pointer
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index c6a015940b41..ba3bf733d27d 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.19-rc1
4# Thu Jul 6 10:02:58 2006 4# Wed Oct 11 01:41:41 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -25,8 +25,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 25# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 26# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 27# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 28# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 29# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 30# CONFIG_MIPS_ATLAS is not set
@@ -83,6 +81,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
83CONFIG_GENERIC_FIND_NEXT_BIT=y 81CONFIG_GENERIC_FIND_NEXT_BIT=y
84CONFIG_GENERIC_HWEIGHT=y 82CONFIG_GENERIC_HWEIGHT=y
85CONFIG_GENERIC_CALIBRATE_DELAY=y 83CONFIG_GENERIC_CALIBRATE_DELAY=y
84CONFIG_GENERIC_TIME=y
86CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 85CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
87CONFIG_DMA_COHERENT=y 86CONFIG_DMA_COHERENT=y
88CONFIG_CPU_BIG_ENDIAN=y 87CONFIG_CPU_BIG_ENDIAN=y
@@ -132,8 +131,8 @@ CONFIG_PAGE_SIZE_4KB=y
132# CONFIG_PAGE_SIZE_64KB is not set 131# CONFIG_PAGE_SIZE_64KB is not set
133# CONFIG_SIBYTE_DMA_PAGEOPS is not set 132# CONFIG_SIBYTE_DMA_PAGEOPS is not set
134CONFIG_MIPS_MT_DISABLED=y 133CONFIG_MIPS_MT_DISABLED=y
135# CONFIG_MIPS_MT_SMTC is not set
136# CONFIG_MIPS_MT_SMP is not set 134# CONFIG_MIPS_MT_SMP is not set
135# CONFIG_MIPS_MT_SMTC is not set
137# CONFIG_MIPS_VPE_LOADER is not set 136# CONFIG_MIPS_VPE_LOADER is not set
138CONFIG_CPU_HAS_LLSC=y 137CONFIG_CPU_HAS_LLSC=y
139CONFIG_CPU_HAS_SYNC=y 138CONFIG_CPU_HAS_SYNC=y
@@ -185,9 +184,11 @@ CONFIG_LOCALVERSION=""
185CONFIG_LOCALVERSION_AUTO=y 184CONFIG_LOCALVERSION_AUTO=y
186CONFIG_SWAP=y 185CONFIG_SWAP=y
187CONFIG_SYSVIPC=y 186CONFIG_SYSVIPC=y
187# CONFIG_IPC_NS is not set
188# CONFIG_POSIX_MQUEUE is not set 188# CONFIG_POSIX_MQUEUE is not set
189# CONFIG_BSD_PROCESS_ACCT is not set 189# CONFIG_BSD_PROCESS_ACCT is not set
190CONFIG_SYSCTL=y 190# CONFIG_TASKSTATS is not set
191# CONFIG_UTS_NS is not set
191# CONFIG_AUDIT is not set 192# CONFIG_AUDIT is not set
192CONFIG_IKCONFIG=y 193CONFIG_IKCONFIG=y
193CONFIG_IKCONFIG_PROC=y 194CONFIG_IKCONFIG_PROC=y
@@ -195,7 +196,9 @@ CONFIG_IKCONFIG_PROC=y
195# CONFIG_RELAY is not set 196# CONFIG_RELAY is not set
196CONFIG_INITRAMFS_SOURCE="" 197CONFIG_INITRAMFS_SOURCE=""
197# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 198# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
199CONFIG_SYSCTL=y
198CONFIG_EMBEDDED=y 200CONFIG_EMBEDDED=y
201# CONFIG_SYSCTL_SYSCALL is not set
199CONFIG_KALLSYMS=y 202CONFIG_KALLSYMS=y
200# CONFIG_KALLSYMS_ALL is not set 203# CONFIG_KALLSYMS_ALL is not set
201# CONFIG_KALLSYMS_EXTRA_PASS is not set 204# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -204,12 +207,12 @@ CONFIG_PRINTK=y
204CONFIG_BUG=y 207CONFIG_BUG=y
205CONFIG_ELF_CORE=y 208CONFIG_ELF_CORE=y
206CONFIG_BASE_FULL=y 209CONFIG_BASE_FULL=y
207CONFIG_RT_MUTEXES=y
208CONFIG_FUTEX=y 210CONFIG_FUTEX=y
209CONFIG_EPOLL=y 211CONFIG_EPOLL=y
210CONFIG_SHMEM=y 212CONFIG_SHMEM=y
211CONFIG_SLAB=y 213CONFIG_SLAB=y
212CONFIG_VM_EVENT_COUNTERS=y 214CONFIG_VM_EVENT_COUNTERS=y
215CONFIG_RT_MUTEXES=y
213# CONFIG_TINY_SHMEM is not set 216# CONFIG_TINY_SHMEM is not set
214CONFIG_BASE_SMALL=0 217CONFIG_BASE_SMALL=0
215# CONFIG_SLOB is not set 218# CONFIG_SLOB is not set
@@ -228,6 +231,7 @@ CONFIG_STOP_MACHINE=y
228# 231#
229# Block layer 232# Block layer
230# 233#
234CONFIG_BLOCK=y
231# CONFIG_BLK_DEV_IO_TRACE is not set 235# CONFIG_BLK_DEV_IO_TRACE is not set
232 236
233# 237#
@@ -249,18 +253,17 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
249CONFIG_HW_HAS_PCI=y 253CONFIG_HW_HAS_PCI=y
250CONFIG_PCI=y 254CONFIG_PCI=y
251CONFIG_PCI_DOMAINS=y 255CONFIG_PCI_DOMAINS=y
256# CONFIG_PCI_MULTITHREAD_PROBE is not set
252CONFIG_PCI_DEBUG=y 257CONFIG_PCI_DEBUG=y
253CONFIG_MMU=y 258CONFIG_MMU=y
254 259
255# 260#
256# PCCARD (PCMCIA/CardBus) support 261# PCCARD (PCMCIA/CardBus) support
257# 262#
258# CONFIG_PCCARD is not set
259 263
260# 264#
261# PCI Hotplug Support 265# PCI Hotplug Support
262# 266#
263# CONFIG_HOTPLUG_PCI is not set
264 267
265# 268#
266# Executable file formats 269# Executable file formats
@@ -271,7 +274,7 @@ CONFIG_BINFMT_ELF=y
271CONFIG_MIPS32_COMPAT=y 274CONFIG_MIPS32_COMPAT=y
272CONFIG_COMPAT=y 275CONFIG_COMPAT=y
273CONFIG_MIPS32_O32=y 276CONFIG_MIPS32_O32=y
274# CONFIG_MIPS32_N32 is not set 277CONFIG_MIPS32_N32=y
275CONFIG_BINFMT_ELF32=y 278CONFIG_BINFMT_ELF32=y
276 279
277# 280#
@@ -288,6 +291,7 @@ CONFIG_PACKET_MMAP=y
288CONFIG_UNIX=y 291CONFIG_UNIX=y
289CONFIG_XFRM=y 292CONFIG_XFRM=y
290CONFIG_XFRM_USER=m 293CONFIG_XFRM_USER=m
294# CONFIG_XFRM_SUB_POLICY is not set
291CONFIG_NET_KEY=y 295CONFIG_NET_KEY=y
292CONFIG_INET=y 296CONFIG_INET=y
293# CONFIG_IP_MULTICAST is not set 297# CONFIG_IP_MULTICAST is not set
@@ -308,10 +312,12 @@ CONFIG_IP_PNP_BOOTP=y
308# CONFIG_INET_TUNNEL is not set 312# CONFIG_INET_TUNNEL is not set
309CONFIG_INET_XFRM_MODE_TRANSPORT=m 313CONFIG_INET_XFRM_MODE_TRANSPORT=m
310CONFIG_INET_XFRM_MODE_TUNNEL=m 314CONFIG_INET_XFRM_MODE_TUNNEL=m
315CONFIG_INET_XFRM_MODE_BEET=y
311CONFIG_INET_DIAG=y 316CONFIG_INET_DIAG=y
312CONFIG_INET_TCP_DIAG=y 317CONFIG_INET_TCP_DIAG=y
313# CONFIG_TCP_CONG_ADVANCED is not set 318# CONFIG_TCP_CONG_ADVANCED is not set
314CONFIG_TCP_CONG_BIC=y 319CONFIG_TCP_CONG_CUBIC=y
320CONFIG_DEFAULT_TCP_CONG="cubic"
315# CONFIG_IPV6 is not set 321# CONFIG_IPV6 is not set
316# CONFIG_INET6_XFRM_TUNNEL is not set 322# CONFIG_INET6_XFRM_TUNNEL is not set
317# CONFIG_INET6_TUNNEL is not set 323# CONFIG_INET6_TUNNEL is not set
@@ -341,7 +347,6 @@ CONFIG_NETWORK_SECMARK=y
341# CONFIG_ATALK is not set 347# CONFIG_ATALK is not set
342# CONFIG_X25 is not set 348# CONFIG_X25 is not set
343# CONFIG_LAPB is not set 349# CONFIG_LAPB is not set
344# CONFIG_NET_DIVERT is not set
345# CONFIG_ECONET is not set 350# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 351# CONFIG_WAN_ROUTER is not set
347 352
@@ -368,7 +373,6 @@ CONFIG_NETWORK_SECMARK=y
368# 373#
369CONFIG_STANDALONE=y 374CONFIG_STANDALONE=y
370CONFIG_PREVENT_FIRMWARE_BUILD=y 375CONFIG_PREVENT_FIRMWARE_BUILD=y
371# CONFIG_FW_LOADER is not set
372# CONFIG_DEBUG_DRIVER is not set 376# CONFIG_DEBUG_DRIVER is not set
373# CONFIG_SYS_HYPERVISOR is not set 377# CONFIG_SYS_HYPERVISOR is not set
374 378
@@ -404,7 +408,7 @@ CONFIG_BLK_DEV_LOOP=m
404CONFIG_BLK_DEV_NBD=m 408CONFIG_BLK_DEV_NBD=m
405# CONFIG_BLK_DEV_SX8 is not set 409# CONFIG_BLK_DEV_SX8 is not set
406# CONFIG_BLK_DEV_RAM is not set 410# CONFIG_BLK_DEV_RAM is not set
407# CONFIG_BLK_DEV_INITRD is not set 411CONFIG_BLK_DEV_INITRD=y
408# CONFIG_CDROM_PKTCDVD is not set 412# CONFIG_CDROM_PKTCDVD is not set
409# CONFIG_ATA_OVER_ETH is not set 413# CONFIG_ATA_OVER_ETH is not set
410 414
@@ -412,6 +416,7 @@ CONFIG_BLK_DEV_NBD=m
412# ATA/ATAPI/MFM/RLL support 416# ATA/ATAPI/MFM/RLL support
413# 417#
414CONFIG_IDE=y 418CONFIG_IDE=y
419CONFIG_IDE_MAX_HWIFS=4
415CONFIG_BLK_DEV_IDE=y 420CONFIG_BLK_DEV_IDE=y
416 421
417# 422#
@@ -429,10 +434,40 @@ CONFIG_BLK_DEV_IDEFLOPPY=y
429# IDE chipset support/bugfixes 434# IDE chipset support/bugfixes
430# 435#
431CONFIG_IDE_GENERIC=y 436CONFIG_IDE_GENERIC=y
432# CONFIG_BLK_DEV_IDEPCI is not set 437CONFIG_BLK_DEV_IDEPCI=y
438# CONFIG_IDEPCI_SHARE_IRQ is not set
439# CONFIG_BLK_DEV_OFFBOARD is not set
440CONFIG_BLK_DEV_GENERIC=y
441# CONFIG_BLK_DEV_OPTI621 is not set
442CONFIG_BLK_DEV_IDEDMA_PCI=y
443# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
444# CONFIG_IDEDMA_PCI_AUTO is not set
445# CONFIG_BLK_DEV_AEC62XX is not set
446# CONFIG_BLK_DEV_ALI15X3 is not set
447# CONFIG_BLK_DEV_AMD74XX is not set
448CONFIG_BLK_DEV_CMD64X=y
449# CONFIG_BLK_DEV_TRIFLEX is not set
450# CONFIG_BLK_DEV_CY82C693 is not set
451# CONFIG_BLK_DEV_CS5520 is not set
452# CONFIG_BLK_DEV_CS5530 is not set
453# CONFIG_BLK_DEV_HPT34X is not set
454# CONFIG_BLK_DEV_HPT366 is not set
455# CONFIG_BLK_DEV_JMICRON is not set
456# CONFIG_BLK_DEV_SC1200 is not set
457# CONFIG_BLK_DEV_PIIX is not set
458# CONFIG_BLK_DEV_IT821X is not set
459# CONFIG_BLK_DEV_NS87415 is not set
460# CONFIG_BLK_DEV_PDC202XX_OLD is not set
461# CONFIG_BLK_DEV_PDC202XX_NEW is not set
462# CONFIG_BLK_DEV_SVWKS is not set
463# CONFIG_BLK_DEV_SIIMAGE is not set
464# CONFIG_BLK_DEV_SLC90E66 is not set
465# CONFIG_BLK_DEV_TRM290 is not set
466# CONFIG_BLK_DEV_VIA82CXXX is not set
433# CONFIG_BLK_DEV_IDE_SWARM is not set 467# CONFIG_BLK_DEV_IDE_SWARM is not set
434# CONFIG_IDE_ARM is not set 468# CONFIG_IDE_ARM is not set
435# CONFIG_BLK_DEV_IDEDMA is not set 469CONFIG_BLK_DEV_IDEDMA=y
470# CONFIG_IDEDMA_IVB is not set
436# CONFIG_IDEDMA_AUTO is not set 471# CONFIG_IDEDMA_AUTO is not set
437# CONFIG_BLK_DEV_HD is not set 472# CONFIG_BLK_DEV_HD is not set
438 473
@@ -441,6 +476,12 @@ CONFIG_IDE_GENERIC=y
441# 476#
442# CONFIG_RAID_ATTRS is not set 477# CONFIG_RAID_ATTRS is not set
443# CONFIG_SCSI is not set 478# CONFIG_SCSI is not set
479# CONFIG_SCSI_NETLINK is not set
480
481#
482# Serial ATA (prod) and Parallel ATA (experimental) drivers
483#
484# CONFIG_ATA is not set
444 485
445# 486#
446# Multi-device support (RAID and LVM) 487# Multi-device support (RAID and LVM)
@@ -516,6 +557,7 @@ CONFIG_NET_SB1250_MAC=y
516# CONFIG_SK98LIN is not set 557# CONFIG_SK98LIN is not set
517# CONFIG_TIGON3 is not set 558# CONFIG_TIGON3 is not set
518# CONFIG_BNX2 is not set 559# CONFIG_BNX2 is not set
560# CONFIG_QLA3XXX is not set
519 561
520# 562#
521# Ethernet (10000 Mbit) 563# Ethernet (10000 Mbit)
@@ -650,7 +692,6 @@ CONFIG_I2C_CHARDEV=y
650# CONFIG_I2C_ALGOBIT is not set 692# CONFIG_I2C_ALGOBIT is not set
651# CONFIG_I2C_ALGOPCF is not set 693# CONFIG_I2C_ALGOPCF is not set
652# CONFIG_I2C_ALGOPCA is not set 694# CONFIG_I2C_ALGOPCA is not set
653CONFIG_I2C_ALGO_SIBYTE=y
654 695
655# 696#
656# I2C Hardware Bus support 697# I2C Hardware Bus support
@@ -712,12 +753,12 @@ CONFIG_I2C_DEBUG_CHIP=y
712# 753#
713# Misc devices 754# Misc devices
714# 755#
756# CONFIG_TIFM_CORE is not set
715 757
716# 758#
717# Multimedia devices 759# Multimedia devices
718# 760#
719# CONFIG_VIDEO_DEV is not set 761# CONFIG_VIDEO_DEV is not set
720CONFIG_VIDEO_V4L2=y
721 762
722# 763#
723# Digital Video Broadcasting Devices 764# Digital Video Broadcasting Devices
@@ -729,6 +770,7 @@ CONFIG_VIDEO_V4L2=y
729# 770#
730# CONFIG_FIRMWARE_EDID is not set 771# CONFIG_FIRMWARE_EDID is not set
731# CONFIG_FB is not set 772# CONFIG_FB is not set
773# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
732 774
733# 775#
734# Sound 776# Sound
@@ -811,6 +853,7 @@ CONFIG_FS_MBCACHE=y
811# CONFIG_JFS_FS is not set 853# CONFIG_JFS_FS is not set
812CONFIG_FS_POSIX_ACL=y 854CONFIG_FS_POSIX_ACL=y
813# CONFIG_XFS_FS is not set 855# CONFIG_XFS_FS is not set
856# CONFIG_GFS2_FS is not set
814# CONFIG_OCFS2_FS is not set 857# CONFIG_OCFS2_FS is not set
815# CONFIG_MINIX_FS is not set 858# CONFIG_MINIX_FS is not set
816# CONFIG_ROMFS_FS is not set 859# CONFIG_ROMFS_FS is not set
@@ -840,8 +883,10 @@ CONFIG_DNOTIFY=y
840# 883#
841CONFIG_PROC_FS=y 884CONFIG_PROC_FS=y
842CONFIG_PROC_KCORE=y 885CONFIG_PROC_KCORE=y
886CONFIG_PROC_SYSCTL=y
843CONFIG_SYSFS=y 887CONFIG_SYSFS=y
844# CONFIG_TMPFS is not set 888CONFIG_TMPFS=y
889# CONFIG_TMPFS_POSIX_ACL is not set
845# CONFIG_HUGETLB_PAGE is not set 890# CONFIG_HUGETLB_PAGE is not set
846CONFIG_RAMFS=y 891CONFIG_RAMFS=y
847# CONFIG_CONFIGFS_FS is not set 892# CONFIG_CONFIGFS_FS is not set
@@ -851,6 +896,7 @@ CONFIG_RAMFS=y
851# 896#
852# CONFIG_ADFS_FS is not set 897# CONFIG_ADFS_FS is not set
853# CONFIG_AFFS_FS is not set 898# CONFIG_AFFS_FS is not set
899# CONFIG_ECRYPT_FS is not set
854# CONFIG_HFS_FS is not set 900# CONFIG_HFS_FS is not set
855# CONFIG_HFSPLUS_FS is not set 901# CONFIG_HFSPLUS_FS is not set
856# CONFIG_BEFS_FS is not set 902# CONFIG_BEFS_FS is not set
@@ -881,7 +927,6 @@ CONFIG_SUNRPC=y
881# CONFIG_RPCSEC_GSS_SPKM3 is not set 927# CONFIG_RPCSEC_GSS_SPKM3 is not set
882# CONFIG_SMB_FS is not set 928# CONFIG_SMB_FS is not set
883# CONFIG_CIFS is not set 929# CONFIG_CIFS is not set
884# CONFIG_CIFS_DEBUG2 is not set
885# CONFIG_NCP_FS is not set 930# CONFIG_NCP_FS is not set
886# CONFIG_CODA_FS is not set 931# CONFIG_CODA_FS is not set
887# CONFIG_AFS_FS is not set 932# CONFIG_AFS_FS is not set
@@ -899,6 +944,10 @@ CONFIG_MSDOS_PARTITION=y
899# CONFIG_NLS is not set 944# CONFIG_NLS is not set
900 945
901# 946#
947# Distributed Lock Manager
948#
949
950#
902# Profiling support 951# Profiling support
903# 952#
904# CONFIG_PROFILING is not set 953# CONFIG_PROFILING is not set
@@ -907,7 +956,8 @@ CONFIG_MSDOS_PARTITION=y
907# Kernel hacking 956# Kernel hacking
908# 957#
909CONFIG_TRACE_IRQFLAGS_SUPPORT=y 958CONFIG_TRACE_IRQFLAGS_SUPPORT=y
910CONFIG_PRINTK_TIME=y 959# CONFIG_PRINTK_TIME is not set
960CONFIG_ENABLE_MUST_CHECK=y
911CONFIG_MAGIC_SYSRQ=y 961CONFIG_MAGIC_SYSRQ=y
912# CONFIG_UNUSED_SYMBOLS is not set 962# CONFIG_UNUSED_SYMBOLS is not set
913CONFIG_DEBUG_KERNEL=y 963CONFIG_DEBUG_KERNEL=y
@@ -920,12 +970,15 @@ CONFIG_DETECT_SOFTLOCKUP=y
920# CONFIG_DEBUG_SPINLOCK is not set 970# CONFIG_DEBUG_SPINLOCK is not set
921CONFIG_DEBUG_MUTEXES=y 971CONFIG_DEBUG_MUTEXES=y
922# CONFIG_DEBUG_RWSEMS is not set 972# CONFIG_DEBUG_RWSEMS is not set
973# CONFIG_DEBUG_LOCK_ALLOC is not set
974# CONFIG_PROVE_LOCKING is not set
923# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 975# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
924# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 976# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
925# CONFIG_DEBUG_KOBJECT is not set 977# CONFIG_DEBUG_KOBJECT is not set
926# CONFIG_DEBUG_INFO is not set 978# CONFIG_DEBUG_INFO is not set
927# CONFIG_DEBUG_FS is not set 979# CONFIG_DEBUG_FS is not set
928# CONFIG_DEBUG_VM is not set 980# CONFIG_DEBUG_VM is not set
981# CONFIG_DEBUG_LIST is not set
929CONFIG_FORCED_INLINING=y 982CONFIG_FORCED_INLINING=y
930# CONFIG_RCU_TORTURE_TEST is not set 983# CONFIG_RCU_TORTURE_TEST is not set
931CONFIG_CROSSCOMPILE=y 984CONFIG_CROSSCOMPILE=y
@@ -946,6 +999,10 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
946# Cryptographic options 999# Cryptographic options
947# 1000#
948CONFIG_CRYPTO=y 1001CONFIG_CRYPTO=y
1002CONFIG_CRYPTO_ALGAPI=y
1003CONFIG_CRYPTO_BLKCIPHER=m
1004CONFIG_CRYPTO_HASH=y
1005CONFIG_CRYPTO_MANAGER=m
949CONFIG_CRYPTO_HMAC=y 1006CONFIG_CRYPTO_HMAC=y
950CONFIG_CRYPTO_NULL=y 1007CONFIG_CRYPTO_NULL=y
951CONFIG_CRYPTO_MD4=y 1008CONFIG_CRYPTO_MD4=y
@@ -955,9 +1012,12 @@ CONFIG_CRYPTO_SHA256=y
955CONFIG_CRYPTO_SHA512=y 1012CONFIG_CRYPTO_SHA512=y
956CONFIG_CRYPTO_WP512=m 1013CONFIG_CRYPTO_WP512=m
957CONFIG_CRYPTO_TGR192=m 1014CONFIG_CRYPTO_TGR192=m
1015CONFIG_CRYPTO_ECB=m
1016CONFIG_CRYPTO_CBC=m
958CONFIG_CRYPTO_DES=y 1017CONFIG_CRYPTO_DES=y
959CONFIG_CRYPTO_BLOWFISH=y 1018CONFIG_CRYPTO_BLOWFISH=y
960CONFIG_CRYPTO_TWOFISH=y 1019CONFIG_CRYPTO_TWOFISH=y
1020CONFIG_CRYPTO_TWOFISH_COMMON=y
961CONFIG_CRYPTO_SERPENT=y 1021CONFIG_CRYPTO_SERPENT=y
962CONFIG_CRYPTO_AES=m 1022CONFIG_CRYPTO_AES=m
963# CONFIG_CRYPTO_CAST5 is not set 1023# CONFIG_CRYPTO_CAST5 is not set
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index 6dc4135d6e11..d848f1a07786 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -37,7 +37,7 @@ extern void jazz_machine_restart(char *command);
37extern void jazz_machine_halt(void); 37extern void jazz_machine_halt(void);
38extern void jazz_machine_power_off(void); 38extern void jazz_machine_power_off(void);
39 39
40void __init plat_time_init(struct irqaction *irq) 40void __init plat_timer_setup(struct irqaction *irq)
41{ 41{
42 /* set the clock to 100 Hz */ 42 /* set the clock to 100 Hz */
43 r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9); 43 r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9);
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 1af3612a1ce8..db80957ada89 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -310,7 +310,7 @@ static void flush_tlb_all_ipi(void *info)
310 310
311void flush_tlb_all(void) 311void flush_tlb_all(void)
312{ 312{
313 on_each_cpu(flush_tlb_all_ipi, 0, 1, 1); 313 on_each_cpu(flush_tlb_all_ipi, NULL, 1, 1);
314} 314}
315 315
316static void flush_tlb_mm_ipi(void *mm) 316static void flush_tlb_mm_ipi(void *mm)
diff --git a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c
index d777b7d1a9fe..f9f404a8ddad 100644
--- a/arch/mips/sgi-ip27/ip27-klnuma.c
+++ b/arch/mips/sgi-ip27/ip27-klnuma.c
@@ -26,7 +26,7 @@ static cpumask_t ktext_repmask;
26 * kernel. For example, we should never put a copy on a headless node, 26 * kernel. For example, we should never put a copy on a headless node,
27 * and we should respect the topology of the machine. 27 * and we should respect the topology of the machine.
28 */ 28 */
29void __init setup_replication_mask() 29void __init setup_replication_mask(void)
30{ 30{
31 cnodeid_t cnode; 31 cnodeid_t cnode;
32 32
diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c
index 6eac36d1b8c8..bf328277c775 100644
--- a/arch/mips/sibyte/bcm1480/smp.c
+++ b/arch/mips/sibyte/bcm1480/smp.c
@@ -34,21 +34,21 @@ extern void smp_call_function_interrupt(void);
34 * independent of board/firmware 34 * independent of board/firmware
35 */ 35 */
36 36
37static void *mailbox_0_set_regs[] = { 37static volatile void *mailbox_0_set_regs[] = {
38 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU), 38 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU),
39 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU), 39 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU),
40 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU), 40 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU),
41 IOADDR(A_BCM1480_IMR_CPU3_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU), 41 IOADDR(A_BCM1480_IMR_CPU3_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU),
42}; 42};
43 43
44static void *mailbox_0_clear_regs[] = { 44static volatile void *mailbox_0_clear_regs[] = {
45 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU), 45 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU),
46 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU), 46 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU),
47 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU), 47 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU),
48 IOADDR(A_BCM1480_IMR_CPU3_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU), 48 IOADDR(A_BCM1480_IMR_CPU3_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU),
49}; 49};
50 50
51static void *mailbox_0_regs[] = { 51static volatile void *mailbox_0_regs[] = {
52 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_CPU), 52 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_CPU),
53 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_CPU), 53 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_CPU),
54 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_CPU), 54 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_CPU),
diff --git a/include/asm-mips/irq.h b/include/asm-mips/irq.h
index 1a9804c65369..0ce2a80b689e 100644
--- a/include/asm-mips/irq.h
+++ b/include/asm-mips/irq.h
@@ -24,8 +24,6 @@ static inline int irq_canonicalize(int irq)
24#define irq_canonicalize(irq) (irq) /* Sane hardware, sane code ... */ 24#define irq_canonicalize(irq) (irq) /* Sane hardware, sane code ... */
25#endif 25#endif
26 26
27struct pt_regs;
28
29extern asmlinkage unsigned int do_IRQ(unsigned int irq); 27extern asmlinkage unsigned int do_IRQ(unsigned int irq);
30 28
31#ifdef CONFIG_MIPS_MT_SMTC 29#ifdef CONFIG_MIPS_MT_SMTC
diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h
index 158a4cd12e46..1fae5dc58138 100644
--- a/include/asm-mips/stackframe.h
+++ b/include/asm-mips/stackframe.h
@@ -59,69 +59,43 @@
59 .endm 59 .endm
60 60
61#ifdef CONFIG_SMP 61#ifdef CONFIG_SMP
62 .macro get_saved_sp /* SMP variation */
63#ifdef CONFIG_32BIT
64#ifdef CONFIG_MIPS_MT_SMTC 62#ifdef CONFIG_MIPS_MT_SMTC
65 .set mips32 63#define PTEBASE_SHIFT 19 /* TCBIND */
66 mfc0 k0, CP0_TCBIND;
67 .set mips0
68 lui k1, %hi(kernelsp)
69 srl k0, k0, 19
70 /* No need to shift down and up to clear bits 0-1 */
71#else 64#else
72 mfc0 k0, CP0_CONTEXT 65#define PTEBASE_SHIFT 23 /* CONTEXT */
73 lui k1, %hi(kernelsp)
74 srl k0, k0, 23
75#endif
76 addu k1, k0
77 LONG_L k1, %lo(kernelsp)(k1)
78#endif 66#endif
79#ifdef CONFIG_64BIT 67 .macro get_saved_sp /* SMP variation */
80#ifdef CONFIG_MIPS_MT_SMTC 68#ifdef CONFIG_MIPS_MT_SMTC
81 .set mips64 69 mfc0 k0, CP0_TCBIND
82 mfc0 k0, CP0_TCBIND;
83 .set mips0
84 lui k0, %highest(kernelsp)
85 dsrl k1, 19
86 /* No need to shift down and up to clear bits 0-2 */
87#else 70#else
88 MFC0 k1, CP0_CONTEXT 71 MFC0 k0, CP0_CONTEXT
89 lui k0, %highest(kernelsp) 72#endif
90 dsrl k1, 23 73#if defined(CONFIG_BUILD_ELF64) || (defined(CONFIG_64BIT) && __GNUC__ < 4)
91 daddiu k0, %higher(kernelsp) 74 lui k1, %highest(kernelsp)
92 dsll k0, k0, 16 75 daddiu k1, %higher(kernelsp)
93 daddiu k0, %hi(kernelsp) 76 dsll k1, 16
94 dsll k0, k0, 16 77 daddiu k1, %hi(kernelsp)
95#endif /* CONFIG_MIPS_MT_SMTC */ 78 dsll k1, 16
96 daddu k1, k1, k0 79#else
80 lui k1, %hi(kernelsp)
81#endif
82 LONG_SRL k0, PTEBASE_SHIFT
83 LONG_ADDU k1, k0
97 LONG_L k1, %lo(kernelsp)(k1) 84 LONG_L k1, %lo(kernelsp)(k1)
98#endif /* CONFIG_64BIT */
99 .endm 85 .endm
100 86
101 .macro set_saved_sp stackp temp temp2 87 .macro set_saved_sp stackp temp temp2
102#ifdef CONFIG_32BIT
103#ifdef CONFIG_MIPS_MT_SMTC
104 mfc0 \temp, CP0_TCBIND
105 srl \temp, 19
106#else
107 mfc0 \temp, CP0_CONTEXT
108 srl \temp, 23
109#endif
110#endif
111#ifdef CONFIG_64BIT
112#ifdef CONFIG_MIPS_MT_SMTC 88#ifdef CONFIG_MIPS_MT_SMTC
113 mfc0 \temp, CP0_TCBIND 89 mfc0 \temp, CP0_TCBIND
114 dsrl \temp, 19
115#else 90#else
116 MFC0 \temp, CP0_CONTEXT 91 MFC0 \temp, CP0_CONTEXT
117 dsrl \temp, 23
118#endif
119#endif 92#endif
93 LONG_SRL \temp, PTEBASE_SHIFT
120 LONG_S \stackp, kernelsp(\temp) 94 LONG_S \stackp, kernelsp(\temp)
121 .endm 95 .endm
122#else 96#else
123 .macro get_saved_sp /* Uniprocessor variation */ 97 .macro get_saved_sp /* Uniprocessor variation */
124#ifdef CONFIG_64BIT 98#if defined(CONFIG_BUILD_ELF64) || (defined(CONFIG_64BIT) && __GNUC__ < 4)
125 lui k1, %highest(kernelsp) 99 lui k1, %highest(kernelsp)
126 daddiu k1, %higher(kernelsp) 100 daddiu k1, %higher(kernelsp)
127 dsll k1, k1, 16 101 dsll k1, k1, 16
diff --git a/include/asm-mips/termbits.h b/include/asm-mips/termbits.h
index fa6d04dac56b..b62ec7c521cc 100644
--- a/include/asm-mips/termbits.h
+++ b/include/asm-mips/termbits.h
@@ -3,7 +3,7 @@
3 * License. See the file "COPYING" in the main directory of this archive 3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details. 4 * for more details.
5 * 5 *
6 * Copyright (C) 1995, 1996, 1999, 2001 Ralf Baechle 6 * Copyright (C) 1995, 96, 99, 2001, 06 Ralf Baechle
7 * Copyright (C) 1999 Silicon Graphics, Inc. 7 * Copyright (C) 1999 Silicon Graphics, Inc.
8 * Copyright (C) 2001 MIPS Technologies, Inc. 8 * Copyright (C) 2001 MIPS Technologies, Inc.
9 */ 9 */
@@ -13,14 +13,8 @@
13#include <linux/posix_types.h> 13#include <linux/posix_types.h>
14 14
15typedef unsigned char cc_t; 15typedef unsigned char cc_t;
16#if (_MIPS_SZLONG == 32) 16typedef unsigned int speed_t;
17typedef unsigned long speed_t; 17typedef unsigned int tcflag_t;
18typedef unsigned long tcflag_t;
19#endif
20#if (_MIPS_SZLONG == 64)
21typedef __u32 speed_t;
22typedef __u32 tcflag_t;
23#endif
24 18
25/* 19/*
26 * The ABI says nothing about NCC but seems to use NCCS as 20 * The ABI says nothing about NCC but seems to use NCCS as
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-27 16:04:54 -0500