Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Kill bogus check from bootmem_init().
  [SPARC64]: Update defconfig.
parents 1e2af92e 715a0ecc

arch/sparc64/defconfig

+20 −18
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.18

# Sat Sep 23 18:32:19 2006

# Tue Sep 26 23:09:35 2006

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -141,6 +141,7 @@ CONFIG_SUN_AUXIO=y 
CONFIG_SUN_IO=y

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

# CONFIG_PCI_MULTITHREAD_PROBE is not set

# CONFIG_PCI_DEBUG is not set

CONFIG_SUN_OPENPROMFS=m

CONFIG_SPARC32_COMPAT=y
@@ -194,21 +195,9 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=y 
CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

CONFIG_TCP_CONG_ADVANCED=y



#

# TCP congestion control

#

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_CUBIC=m

CONFIG_TCP_CONG_WESTWOOD=m

CONFIG_TCP_CONG_HTCP=m

CONFIG_TCP_CONG_HSTCP=m

CONFIG_TCP_CONG_HYBLA=m

CONFIG_TCP_CONG_VEGAS=m

CONFIG_TCP_CONG_SCALABLE=m

CONFIG_TCP_CONG_LP=m

CONFIG_TCP_CONG_VENO=m

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

CONFIG_IPV6=m

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y
@@ -247,6 +236,7 @@ CONFIG_IP_DCCP_TFRC_LIB=m 
# DCCP Kernel Hacking

#

# CONFIG_IP_DCCP_DEBUG is not set

# CONFIG_NET_DCCPPROBE is not set



#

# SCTP Configuration (EXPERIMENTAL)
@@ -401,6 +391,7 @@ CONFIG_IDEDMA_AUTO=y 
#

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

CONFIG_SCSI_NETLINK=y

CONFIG_SCSI_PROC_FS=y



#
@@ -422,12 +413,13 @@ CONFIG_SCSI_CONSTANTS=y 
# CONFIG_SCSI_LOGGING is not set



#

# SCSI Transport Attributes

# SCSI Transports

#

CONFIG_SCSI_SPI_ATTRS=y

CONFIG_SCSI_FC_ATTRS=y

CONFIG_SCSI_ISCSI_ATTRS=m

# CONFIG_SCSI_SAS_ATTRS is not set

# CONFIG_SCSI_SAS_LIBSAS is not set



#

# SCSI low-level drivers
@@ -440,16 +432,18 @@ CONFIG_ISCSI_TCP=m 
# CONFIG_SCSI_AIC7XXX is not set

# CONFIG_SCSI_AIC7XXX_OLD is not set

# CONFIG_SCSI_AIC79XX is not set

# CONFIG_SCSI_AIC94XX is not set

# CONFIG_SCSI_ARCMSR is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_SAS is not set

# CONFIG_SCSI_SATA is not set

# CONFIG_SCSI_HPTIOP is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_IPS is not set

# CONFIG_SCSI_INITIO is not set

# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_STEX is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -461,6 +455,11 @@ CONFIG_ISCSI_TCP=m 
# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_SUNESP is not set



#

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

#

# CONFIG_ATA is not set



#

# Multi-device support (RAID and LVM)

#
@@ -575,6 +574,7 @@ CONFIG_E1000_NAPI=y 
# CONFIG_VIA_VELOCITY is not set

CONFIG_TIGON3=m

CONFIG_BNX2=m

# CONFIG_QLA3XXX is not set



#

# Ethernet (10000 Mbit)
@@ -1006,6 +1006,7 @@ CONFIG_SND_ALI5451=m 
# CONFIG_SND_VIA82XX_MODEM is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_YMFPCI is not set

# CONFIG_SND_AC97_POWER_SAVE is not set



#

# USB devices
@@ -1353,6 +1354,7 @@ CONFIG_KPROBES=y 
# Kernel hacking

#

CONFIG_PRINTK_TIME=y

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_KERNEL=y

arch/sparc64/mm/init.c

+1 −2
Original line number Diff line number Diff line
@@ -920,7 +920,6 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail, 
	if (sparc_ramdisk_image || sparc_ramdisk_image64) {

		unsigned long ramdisk_image = sparc_ramdisk_image ?

			sparc_ramdisk_image : sparc_ramdisk_image64;

		if (ramdisk_image >= (unsigned long)_end - 2 * PAGE_SIZE)

		ramdisk_image -= KERNBASE;

		initrd_start = ramdisk_image + phys_base;

		initrd_end = initrd_start + sparc_ramdisk_size;