Commit 6e98ee75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fill holes in hypervisor APIs and fix KTSB registry.
  [SPARC64]: Fix two bugs wrt. kernel 4MB TSB.
  [SPARC]: Mark as emulating cmpxchg, add appropriate depends for DRM.
  [SPARC]: Emulate cmpxchg like parisc
  [SPARC64]: Fix _PAGE_EXEC_4U check in sun4u I-TLB miss handler.
  [SPARC]: Linux always started with 9600 8N1
  [SPARC64]: arch/sparc64/time.c doesn't compile on Ultra 1 (no PCI)
  [SPARC64]: Eliminate NR_CPUS limitations.
  [SPARC64]: Use machine description and OBP properly for cpu probing.
  [SPARC64]: Negotiate hypervisor API for PCI services.
  [SPARC64]: Report proper system soft state to the hypervisor.
  [SPARC64]: Fix typo in sun4v_hvapi_register error handling.
  [SCSI] ESP: Kill SCSI_ESP_CORE and link directly just like jazz_esp
  [SCSI] jazz_esp: Converted to use esp_core.
  [SPARC64]: PCI device scan is way too verbose by default.
  [SERIAL] sunzilog: section mismatch fix
  [SPARC32]: Removes mismatch section warnigs in sparc time.c file
  [SPARC64]: Don't be picky about virtual-dma values on sun4v.
  [SPARC64]: Kill unused DIE_PAGE_FAULT enum value.
  [SCSI] pluto: Use wait_for_completion_timeout.
parents 486b4ce1 7db35f31

arch/sparc/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -178,6 +178,13 @@ config ARCH_HAS_ILOG2_U64 
	bool

	default n



config EMULATED_CMPXCHG

	bool

	default y

	help

	  Sparc32 does not have a CAS instruction like sparc64. cmpxchg()

	  is emulated, and therefore it is not completely atomic.



config SUN_PM

	bool

	default y

arch/sparc/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) 
}



/* Kick start a stopped clock (procedure from the Sun NVRAM/hostid FAQ). */

static void __init kick_start_clock(void)

static void __devinit kick_start_clock(void)

{

	struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs;

	unsigned char sec;
@@ -223,7 +223,7 @@ static __inline__ int has_low_battery(void) 
	return (data1 == data2);	/* Was the write blocked? */

}



static void __init mostek_set_system_time(void)

static void __devinit mostek_set_system_time(void)

{

	unsigned int year, mon, day, hour, min, sec;

	struct mostek48t02 *mregs;

arch/sparc/lib/atomic32.c

+15 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * atomic32.c: 32-bit atomic_t implementation

 *

 * Copyright (C) 2004 Keith M Wesolowski

 * Copyright (C) 2007 Kyle McMartin

 * 

 * Based on asm-parisc/atomic.h Copyright (C) 2000 Philipp Rumpf

 */
@@ -117,3 +118,17 @@ unsigned long ___change_bit(unsigned long *addr, unsigned long mask) 
	return old & mask;

}

EXPORT_SYMBOL(___change_bit);



unsigned long __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new)

{

	unsigned long flags;

	u32 prev;



	spin_lock_irqsave(ATOMIC_HASH(addr), flags);

	if ((prev = *ptr) == old)

		*ptr = new;

	spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);



	return (unsigned long)prev;

}

EXPORT_SYMBOL(__cmpxchg_u32);

arch/sparc64/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -147,10 +147,10 @@ config SMP 
	  If you don't know what to do here, say N.



config NR_CPUS

	int "Maximum number of CPUs (2-64)"

	range 2 64

	int "Maximum number of CPUs (2-1024)"

	range 2 1024

	depends on SMP

	default "32"

	default "64"



source "drivers/cpufreq/Kconfig"

arch/sparc64/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ EXTRA_CFLAGS := -Werror 
extra-y		:= head.o init_task.o vmlinux.lds



obj-y		:= process.o setup.o cpu.o idprom.o \

		   traps.o devices.o auxio.o una_asm.o \

		   traps.o auxio.o una_asm.o \

		   irq.o ptrace.o time.o sys_sparc.o signal.o \

		   unaligned.o central.o pci.o starfire.o semaphore.o \

		   power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o \

		   visemul.o prom.o of_device.o hvapi.o

		   visemul.o prom.o of_device.o hvapi.o sstate.o mdesc.o



obj-$(CONFIG_STACKTRACE) += stacktrace.o

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE