Commit c25d5180 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Pass NULL not 0 for pointer value.
  [MIPS] IP27: Make declaration of setup_replication_mask a proper prototype.
  [MIPS] BigSur: More useful defconfig.
  [MIPS] Cleanup definitions of speed_t and tcflag_t.
  [MIPS] Fix compilation warnings in arch/mips/sibyte/bcm1480/smp.c
  [MIPS] Optimize and cleanup get_saved_sp, set_saved_sp
  [MIPS] <asm/irq.h> does not need pt_regs anymore.
  [MIPS] Workaround for bug in gcc -EB / -EL options.
  [MIPS] Fix timer setup for Jazz
parents 0ca9caae 9a244b95

arch/mips/Makefile

+11 −2
Original line number Diff line number Diff line
@@ -91,8 +91,17 @@ cflags-y += -ffreestanding 
# carefully avoid to add it redundantly because gcc 3.3/3.4 complains

# when fed the toolchain default!

#

cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB -D__MIPSEB__)

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL -D__MIPSEL__)

# Certain gcc versions upto gcc 4.1.1 (probably 4.2-subversion as of

# 2006-10-10 don't properly change the the predefined symbols if -EB / -EL

# are used, so we kludge that here.  A bug has been filed at

# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413.

#

undef-all += -UMIPSEB -U_MIPSEB -U__MIPSEB -U__MIPSEB__

undef-all += -UMIPSEL -U_MIPSEL -U__MIPSEL -U__MIPSEL__

predef-be += -DMIPSEB -D_MIPSEB -D__MIPSEB -D__MIPSEB__

predef-le += -DMIPSEL -D_MIPSEL -D__MIPSEL -D__MIPSEL__

cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB $(undef-all) $(predef-be))

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL $(undef-all) $(predef-le))



cflags-$(CONFIG_SB1XXX_CORELIS)	+= $(call cc-option,-mno-sched-prolog) \

				   -fno-omit-frame-pointer

arch/mips/configs/bigsur_defconfig

+81 −21
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.18-rc1

# Thu Jul  6 10:02:58 2006

# Linux kernel version: 2.6.19-rc1

# Wed Oct 11 01:41:41 2006

#

CONFIG_MIPS=y
@@ -25,8 +25,6 @@ CONFIG_MIPS=y 
# CONFIG_MIPS_COBALT is not set

# CONFIG_MACH_DECSTATION is not set

# CONFIG_MIPS_EV64120 is not set

# CONFIG_MIPS_IVR is not set

# CONFIG_MIPS_ITE8172 is not set

# CONFIG_MACH_JAZZ is not set

# CONFIG_LASAT is not set

# CONFIG_MIPS_ATLAS is not set
@@ -83,6 +81,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_TIME=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_DMA_COHERENT=y

CONFIG_CPU_BIG_ENDIAN=y
@@ -132,8 +131,8 @@ CONFIG_PAGE_SIZE_4KB=y 
# CONFIG_PAGE_SIZE_64KB is not set

# CONFIG_SIBYTE_DMA_PAGEOPS is not set

CONFIG_MIPS_MT_DISABLED=y

# CONFIG_MIPS_MT_SMTC is not set

# CONFIG_MIPS_MT_SMP is not set

# CONFIG_MIPS_MT_SMTC is not set

# CONFIG_MIPS_VPE_LOADER is not set

CONFIG_CPU_HAS_LLSC=y

CONFIG_CPU_HAS_SYNC=y
@@ -185,9 +184,11 @@ CONFIG_LOCALVERSION="" 
CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_IPC_NS is not set

# CONFIG_POSIX_MQUEUE is not set

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_TASKSTATS is not set

# CONFIG_UTS_NS is not set

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -195,7 +196,9 @@ CONFIG_IKCONFIG_PROC=y 
# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_EMBEDDED=y

# CONFIG_SYSCTL_SYSCALL is not set

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -204,12 +207,12 @@ CONFIG_PRINTK=y 
CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_RT_MUTEXES=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set
@@ -228,6 +231,7 @@ CONFIG_STOP_MACHINE=y 
#

# Block layer

#

CONFIG_BLOCK=y

# CONFIG_BLK_DEV_IO_TRACE is not set



#
@@ -249,18 +253,17 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
CONFIG_HW_HAS_PCI=y

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

# CONFIG_PCI_MULTITHREAD_PROBE is not set

CONFIG_PCI_DEBUG=y

CONFIG_MMU=y



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set



#

# PCI Hotplug Support

#

# CONFIG_HOTPLUG_PCI is not set



#

# Executable file formats
@@ -271,7 +274,7 @@ CONFIG_BINFMT_ELF=y 
CONFIG_MIPS32_COMPAT=y

CONFIG_COMPAT=y

CONFIG_MIPS32_O32=y

# CONFIG_MIPS32_N32 is not set

CONFIG_MIPS32_N32=y

CONFIG_BINFMT_ELF32=y



#
@@ -288,6 +291,7 @@ CONFIG_PACKET_MMAP=y 
CONFIG_UNIX=y

CONFIG_XFRM=y

CONFIG_XFRM_USER=m

# CONFIG_XFRM_SUB_POLICY is not set

CONFIG_NET_KEY=y

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set
@@ -308,10 +312,12 @@ CONFIG_IP_PNP_BOOTP=y 
# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set
@@ -341,7 +347,6 @@ CONFIG_NETWORK_SECMARK=y 
# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set
@@ -368,7 +373,6 @@ CONFIG_NETWORK_SECMARK=y 
#

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_SYS_HYPERVISOR is not set
@@ -404,7 +408,7 @@ CONFIG_BLK_DEV_LOOP=m 
CONFIG_BLK_DEV_NBD=m

# CONFIG_BLK_DEV_SX8 is not set

# CONFIG_BLK_DEV_RAM is not set

# CONFIG_BLK_DEV_INITRD is not set

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set
@@ -412,6 +416,7 @@ CONFIG_BLK_DEV_NBD=m 
# ATA/ATAPI/MFM/RLL support

#

CONFIG_IDE=y

CONFIG_IDE_MAX_HWIFS=4

CONFIG_BLK_DEV_IDE=y



#
@@ -429,10 +434,40 @@ CONFIG_BLK_DEV_IDEFLOPPY=y 
# IDE chipset support/bugfixes

#

CONFIG_IDE_GENERIC=y

# CONFIG_BLK_DEV_IDEPCI is not set

CONFIG_BLK_DEV_IDEPCI=y

# CONFIG_IDEPCI_SHARE_IRQ is not set

# CONFIG_BLK_DEV_OFFBOARD is not set

CONFIG_BLK_DEV_GENERIC=y

# CONFIG_BLK_DEV_OPTI621 is not set

CONFIG_BLK_DEV_IDEDMA_PCI=y

# CONFIG_BLK_DEV_IDEDMA_FORCED is not set

# CONFIG_IDEDMA_PCI_AUTO is not set

# CONFIG_BLK_DEV_AEC62XX is not set

# CONFIG_BLK_DEV_ALI15X3 is not set

# CONFIG_BLK_DEV_AMD74XX is not set

CONFIG_BLK_DEV_CMD64X=y

# CONFIG_BLK_DEV_TRIFLEX is not set

# CONFIG_BLK_DEV_CY82C693 is not set

# CONFIG_BLK_DEV_CS5520 is not set

# CONFIG_BLK_DEV_CS5530 is not set

# CONFIG_BLK_DEV_HPT34X is not set

# CONFIG_BLK_DEV_HPT366 is not set

# CONFIG_BLK_DEV_JMICRON is not set

# CONFIG_BLK_DEV_SC1200 is not set

# CONFIG_BLK_DEV_PIIX is not set

# CONFIG_BLK_DEV_IT821X is not set

# CONFIG_BLK_DEV_NS87415 is not set

# CONFIG_BLK_DEV_PDC202XX_OLD is not set

# CONFIG_BLK_DEV_PDC202XX_NEW is not set

# CONFIG_BLK_DEV_SVWKS is not set

# CONFIG_BLK_DEV_SIIMAGE is not set

# CONFIG_BLK_DEV_SLC90E66 is not set

# CONFIG_BLK_DEV_TRM290 is not set

# CONFIG_BLK_DEV_VIA82CXXX is not set

# CONFIG_BLK_DEV_IDE_SWARM is not set

# CONFIG_IDE_ARM is not set

# CONFIG_BLK_DEV_IDEDMA is not set

CONFIG_BLK_DEV_IDEDMA=y

# CONFIG_IDEDMA_IVB is not set

# CONFIG_IDEDMA_AUTO is not set

# CONFIG_BLK_DEV_HD is not set
@@ -441,6 +476,12 @@ CONFIG_IDE_GENERIC=y 
#

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set

# CONFIG_SCSI_NETLINK is not set



#

# Serial ATA (prod) and Parallel ATA (experimental) drivers

#

# CONFIG_ATA is not set



#

# Multi-device support (RAID and LVM)
@@ -516,6 +557,7 @@ CONFIG_NET_SB1250_MAC=y 
# CONFIG_SK98LIN is not set

# CONFIG_TIGON3 is not set

# CONFIG_BNX2 is not set

# CONFIG_QLA3XXX is not set



#

# Ethernet (10000 Mbit)
@@ -650,7 +692,6 @@ CONFIG_I2C_CHARDEV=y 
# CONFIG_I2C_ALGOBIT is not set

# CONFIG_I2C_ALGOPCF is not set

# CONFIG_I2C_ALGOPCA is not set

CONFIG_I2C_ALGO_SIBYTE=y



#

# I2C Hardware Bus support
@@ -712,12 +753,12 @@ CONFIG_I2C_DEBUG_CHIP=y 
#

# Misc devices

#

# CONFIG_TIFM_CORE is not set



#

# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

CONFIG_VIDEO_V4L2=y



#

# Digital Video Broadcasting Devices
@@ -729,6 +770,7 @@ CONFIG_VIDEO_V4L2=y 
#

# CONFIG_FIRMWARE_EDID is not set

# CONFIG_FB is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Sound
@@ -811,6 +853,7 @@ CONFIG_FS_MBCACHE=y 
# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set
@@ -840,8 +883,10 @@ CONFIG_DNOTIFY=y 
#

CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_SYSCTL=y

CONFIG_SYSFS=y

# CONFIG_TMPFS is not set

CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

# CONFIG_CONFIGFS_FS is not set
@@ -851,6 +896,7 @@ CONFIG_RAMFS=y 
#

# CONFIG_ADFS_FS is not set

# CONFIG_AFFS_FS is not set

# CONFIG_ECRYPT_FS is not set

# CONFIG_HFS_FS is not set

# CONFIG_HFSPLUS_FS is not set

# CONFIG_BEFS_FS is not set
@@ -881,7 +927,6 @@ CONFIG_SUNRPC=y 
# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

# CONFIG_CIFS_DEBUG2 is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set
@@ -898,6 +943,10 @@ CONFIG_MSDOS_PARTITION=y 
#

# CONFIG_NLS is not set



#

# Distributed Lock Manager

#



#

# Profiling support

#
@@ -907,7 +956,8 @@ CONFIG_MSDOS_PARTITION=y 
# Kernel hacking

#

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

CONFIG_PRINTK_TIME=y

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_KERNEL=y
@@ -920,12 +970,15 @@ CONFIG_DETECT_SOFTLOCKUP=y 
# CONFIG_DEBUG_SPINLOCK is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_RWSEMS is not set

# CONFIG_DEBUG_LOCK_ALLOC is not set

# CONFIG_PROVE_LOCKING is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_CROSSCOMPILE=y
@@ -946,6 +999,10 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y 
# Cryptographic options

#

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=m

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_MANAGER=m

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_MD4=y
@@ -955,9 +1012,12 @@ CONFIG_CRYPTO_SHA256=y 
CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_CBC=m

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_BLOWFISH=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_TWOFISH_COMMON=y

CONFIG_CRYPTO_SERPENT=y

CONFIG_CRYPTO_AES=m

# CONFIG_CRYPTO_CAST5 is not set

arch/mips/jazz/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ extern void jazz_machine_restart(char *command); 
extern void jazz_machine_halt(void);

extern void jazz_machine_power_off(void);



void __init plat_time_init(struct irqaction *irq)

void __init plat_timer_setup(struct irqaction *irq)

{

	/* set the clock to 100 Hz */

	r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9);

arch/mips/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static void flush_tlb_all_ipi(void *info) 


void flush_tlb_all(void)

{

	on_each_cpu(flush_tlb_all_ipi, 0, 1, 1);

	on_each_cpu(flush_tlb_all_ipi, NULL, 1, 1);

}



static void flush_tlb_mm_ipi(void *mm)

arch/mips/sgi-ip27/ip27-klnuma.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static cpumask_t ktext_repmask; 
 * kernel.  For example, we should never put a copy on a headless node,

 * and we should respect the topology of the machine.

 */

void __init setup_replication_mask()

void __init setup_replication_mask(void)

{

	cnodeid_t	cnode;

CRA Git | Maintained and supported by SUSTech CRA and CCSE