Commit ef93127e 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:
  [SERIAL] sunsu: Fix section mismatch warnings.
  [SPARC64]: pgtable_cache_init() should be __init.
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/prom.c
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/pci.c
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/console.c
  [MM]: sparse_init() should be __init.
  [SPARC64]: Update defconfig.
  [VIDEO]: Add Sun XVR-2500 framebuffer driver.
  [VIDEO]: Add Sun XVR-500 framebuffer driver.
  [SPARC64]: SUN4U PCI-E controller support.
  [SPARC]: Fix comment typo in smp4m_blackbox_current().
  [SCSI] SUNESP: sun_esp.c needs linux/delay.h

Fix up conflict in arch/sparc64/mm/init.c manually due to removal of
pgtable_cache_init() through the -mm patches (even though that patch was
also by David ;)

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parents 972d45fb 90a660a4

arch/sparc/kernel/sun4m_smp.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ void __init smp4m_blackbox_current(unsigned *addr) 
	

	addr[0] = 0x81580000 | rd;		/* rd %tbr, reg */

	addr[2] = 0x8130200a | rd | rs1;    	/* srl reg, 0xa, reg */

	addr[4] = 0x8008200c | rd | rs1;	/* and reg, 3, reg */

	addr[4] = 0x8008200c | rd | rs1;	/* and reg, 0xc, reg */

}



void __init sun4m_init_smp(void)

arch/sparc64/defconfig

+46 −25
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.21-rc4

# Sat Mar 17 14:18:44 2007

# Linux kernel version: 2.6.21

# Sun May  6 22:46:54 2007

#

CONFIG_SPARC=y

CONFIG_SPARC64=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_64BIT=y

CONFIG_MMU=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_LOCKDEP_SUPPORT=y

CONFIG_TIME_INTERPOLATION=y

CONFIG_ARCH_MAY_HAVE_PC_FDC=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -108,6 +109,9 @@ CONFIG_GENERIC_HARDIRQS=y 
#

# General machine setup

#

CONFIG_TICK_ONESHOT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

# CONFIG_SMP is not set

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_TABLE=m
@@ -140,8 +144,7 @@ CONFIG_SELECT_MEMORY_MODEL=y 
CONFIG_SPARSEMEM_MANUAL=y

CONFIG_SPARSEMEM=y

CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_EXTREME=y

CONFIG_SPARSEMEM_STATIC=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_RESOURCES_64BIT=y

CONFIG_ZONE_DMA_FLAG=0
@@ -151,6 +154,7 @@ CONFIG_SUN_AUXIO=y 
CONFIG_SUN_IO=y

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

CONFIG_ARCH_SUPPORTS_MSI=y

CONFIG_PCI_MSI=y

# CONFIG_PCI_DEBUG is not set

CONFIG_SUN_OPENPROMFS=m
@@ -178,7 +182,6 @@ CONFIG_NET=y 
#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y
@@ -219,6 +222,7 @@ CONFIG_IPV6=m 
CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m
@@ -292,6 +296,14 @@ CONFIG_NET_TCPPROBE=m 
# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set



#

# Wireless

#

# CONFIG_CFG80211 is not set

# CONFIG_WIRELESS_EXT is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set



#
@@ -312,10 +324,6 @@ CONFIG_FW_LOADER=y 
# Connector - unified userspace <-> kernelspace linker

#

CONFIG_CONNECTOR=m



#

# Memory Technology Devices (MTD)

#

# CONFIG_MTD is not set



#
@@ -383,7 +391,6 @@ CONFIG_BLK_DEV_IDEPCI=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=y

CONFIG_IDEDMA_ONLYDISK=y

# CONFIG_BLK_DEV_AEC62XX is not set

CONFIG_BLK_DEV_ALI15X3=y
@@ -413,7 +420,6 @@ CONFIG_BLK_DEV_ALI15X3=y 
# CONFIG_IDE_ARM is not set

CONFIG_BLK_DEV_IDEDMA=y

# CONFIG_IDEDMA_IVB is not set

CONFIG_IDEDMA_AUTO=y

# CONFIG_BLK_DEV_HD is not set



#
@@ -443,6 +449,7 @@ CONFIG_SCSI_MULTI_LUN=y 
CONFIG_SCSI_CONSTANTS=y

# CONFIG_SCSI_LOGGING is not set

# CONFIG_SCSI_SCAN_ASYNC is not set

CONFIG_SCSI_WAIT_SCAN=m



#

# SCSI Transports
@@ -485,6 +492,7 @@ CONFIG_ISCSI_TCP=m 
# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_ESP_CORE is not set

# CONFIG_SCSI_SUNESP is not set

# CONFIG_SCSI_SRP is not set
@@ -628,9 +636,10 @@ CONFIG_BNX2=m 
# CONFIG_TR is not set



#

# Wireless LAN (non-hamradio)

# Wireless LAN

#

# CONFIG_NET_RADIO is not set

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set



#

# Wan interfaces
@@ -695,6 +704,12 @@ CONFIG_KEYBOARD_LKKBD=m 
# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_INPUT_MOUSE=y

CONFIG_MOUSE_PS2=y

CONFIG_MOUSE_PS2_ALPS=y

CONFIG_MOUSE_PS2_LOGIPS2PP=y

CONFIG_MOUSE_PS2_SYNAPTICS=y

CONFIG_MOUSE_PS2_LIFEBOOK=y

CONFIG_MOUSE_PS2_TRACKPOINT=y

# CONFIG_MOUSE_PS2_TOUCHKIT is not set

CONFIG_MOUSE_SERIAL=y

# CONFIG_MOUSE_VSXXXAA is not set

# CONFIG_INPUT_JOYSTICK is not set
@@ -702,6 +717,7 @@ CONFIG_MOUSE_SERIAL=y 
CONFIG_INPUT_MISC=y

CONFIG_INPUT_SPARCSPKR=y

# CONFIG_INPUT_UINPUT is not set

# CONFIG_INPUT_POLLDEV is not set



#

# Hardware I/O ports
@@ -763,11 +779,8 @@ CONFIG_RTC=y 
# TPM devices

#

# CONFIG_TCG_TPM is not set



#

# I2C support

#

CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

# CONFIG_I2C_CHARDEV is not set



#
@@ -791,17 +804,17 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PASEMI is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set

# CONFIG_I2C_SIMTEC is not set

# CONFIG_I2C_SIS5595 is not set

# CONFIG_I2C_SIS630 is not set

# CONFIG_I2C_SIS96X is not set

# CONFIG_I2C_STUB is not set

# CONFIG_I2C_TINY_USB is not set

# CONFIG_I2C_VIA is not set

# CONFIG_I2C_VIAPRO is not set

# CONFIG_I2C_VOODOO3 is not set

# CONFIG_I2C_PCA_ISA is not set



#

# Miscellaneous I2C Chip support
@@ -912,7 +925,7 @@ CONFIG_FB_MODE_HELPERS=y 
CONFIG_FB_TILEBLITTING=y



#

# Frambuffer hardware drivers

# Frame buffer hardware drivers

#

# CONFIG_FB_CIRRUS is not set

# CONFIG_FB_PM2 is not set
@@ -937,6 +950,8 @@ CONFIG_FB_RADEON_I2C=y 
# CONFIG_FB_3DFX is not set

# CONFIG_FB_VOODOO1 is not set

# CONFIG_FB_TRIDENT is not set

# CONFIG_FB_XVR500 is not set

# CONFIG_FB_XVR2500 is not set

# CONFIG_FB_PCI is not set

# CONFIG_FB_VIRTUAL is not set
@@ -1093,6 +1108,14 @@ CONFIG_AC97_BUS=m 
CONFIG_HID=y

# CONFIG_HID_DEBUG is not set



#

# USB Input Devices

#

CONFIG_USB_HID=y

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_HID_FF is not set

CONFIG_USB_HIDDEV=y



#

# USB support

#
@@ -1106,6 +1129,7 @@ CONFIG_USB=y 
# Miscellaneous USB options

#

CONFIG_USB_DEVICEFS=y

# CONFIG_USB_DEVICE_CLASS is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_OTG is not set
@@ -1156,10 +1180,6 @@ CONFIG_USB_STORAGE=m 
#

# USB Input Devices

#

CONFIG_USB_HID=y

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_HID_FF is not set

CONFIG_USB_HIDDEV=y

# CONFIG_USB_AIPTEK is not set

# CONFIG_USB_WACOM is not set

# CONFIG_USB_ACECAD is not set
@@ -1524,6 +1544,7 @@ CONFIG_CRYPTO_ECB=m 
CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_LRW=m

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_BLOWFISH=m

arch/sparc64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ obj-y := process.o setup.o cpu.o idprom.o \ 
obj-$(CONFIG_STACKTRACE) += stacktrace.o

obj-$(CONFIG_PCI)	 += ebus.o isa.o pci_common.o pci_iommu.o \

			    pci_psycho.o pci_sabre.o pci_schizo.o \

			    pci_sun4v.o pci_sun4v_asm.o

			    pci_sun4v.o pci_sun4v_asm.o pci_fire.o

obj-$(CONFIG_SMP)	 += smp.o trampoline.o

obj-$(CONFIG_SPARC32_COMPAT) += sys32.o sys_sparc32.o signal32.o

obj-$(CONFIG_BINFMT_ELF32) += binfmt_elf32.o

arch/sparc64/kernel/central.c

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ void apply_central_ranges(struct linux_central *central, 
			    central->num_central_ranges);

}



void * __init central_alloc_bootmem(unsigned long size)

static void * __init central_alloc_bootmem(unsigned long size)

{

	void *ret;
@@ -116,7 +116,7 @@ static unsigned long prom_reg_to_paddr(struct linux_prom_registers *r) 
	return ret | (unsigned long) r->phys_addr;

}



static void probe_other_fhcs(void)

static void __init probe_other_fhcs(void)

{

	struct device_node *dp;

	const struct linux_prom64_registers *fpregs;
@@ -298,7 +298,7 @@ static void init_all_fhc_hw(void) 


}



void central_probe(void)

void __init central_probe(void)

{

	struct linux_prom_registers fpregs[6];

	const struct linux_prom_registers *pr;

arch/sparc64/kernel/irq.c

+10 −6
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static void sun4u_irq_enable(unsigned int virt_irq) 
	struct irq_handler_data *data = get_irq_chip_data(virt_irq);



	if (likely(data)) {

		unsigned long cpuid, imap;

		unsigned long cpuid, imap, val;

		unsigned int tid;



		cpuid = irq_choose_cpu(virt_irq);
@@ -287,7 +287,11 @@ static void sun4u_irq_enable(unsigned int virt_irq) 


		tid = sun4u_compute_tid(imap, cpuid);



		upa_writel(tid | IMAP_VALID, imap);

		val = upa_readq(imap);

		val &= ~(IMAP_TID_UPA | IMAP_TID_JBUS |

			 IMAP_AID_SAFARI | IMAP_NID_SAFARI);

		val |= tid | IMAP_VALID;

		upa_writeq(val, imap);

	}

}
@@ -297,10 +301,10 @@ static void sun4u_irq_disable(unsigned int virt_irq) 


	if (likely(data)) {

		unsigned long imap = data->imap;

		u32 tmp = upa_readl(imap);

		u32 tmp = upa_readq(imap);



		tmp &= ~IMAP_VALID;

		upa_writel(tmp, imap);

		upa_writeq(tmp, imap);

	}

}
@@ -309,7 +313,7 @@ static void sun4u_irq_end(unsigned int virt_irq) 
	struct irq_handler_data *data = get_irq_chip_data(virt_irq);



	if (likely(data))

		upa_writel(ICLR_IDLE, data->iclr);

		upa_writeq(ICLR_IDLE, data->iclr);

}



static void sun4v_irq_enable(unsigned int virt_irq)
@@ -465,7 +469,7 @@ unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap) 


	BUG_ON(tlb_type == hypervisor);



	ino = (upa_readl(imap) & (IMAP_IGN | IMAP_INO)) + inofixup;

	ino = (upa_readq(imap) & (IMAP_IGN | IMAP_INO)) + inofixup;

	bucket = &ivector_table[ino];

	if (!bucket->virt_irq) {

		bucket->virt_irq = virt_irq_alloc(__irq(bucket));

CRA Git | Maintained and supported by SUSTech CRA and CCSE