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

Commit 95977d0e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  math-emu: correct test for downshifting fraction in _FP_FROM_INT()
  perf: Add DWARF register lookup for sparc
  MAINTAINERS: Add SBUS driver path to sparc entry.
  drivers/sbus: Remove unnecessary casts of private_data
  sparc: remove homegrown L1_CACHE_ALIGN macro
  sparc64: fix the build error due to smp_kgdb_capture_client()
  sparc64: Fix maybe_change_configuration() PCR setting.
  arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference
  sparc64: Update defconfig.
  sunsu: Fix use after free in su_remove().
  sunserial: Don't call add_preferred_console() when console= is specified.
  sparc32: Kill none_mask, it's bogus.
parents a4ce96ac f8324e20

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5336,6 +5336,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git

S:	Maintained

F:	arch/sparc/

F:	drivers/sbus



SPARC SERIAL DRIVERS

M:	"David S. Miller" <davem@davemloft.net>

arch/sparc/configs/sparc64_defconfig

+35 −14
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.34-rc3

# Sat Apr  3 15:49:56 2010

# Linux kernel version: 2.6.34

# Wed May 26 21:14:01 2010

#

CONFIG_64BIT=y

CONFIG_SPARC=y
@@ -107,10 +107,9 @@ CONFIG_PERF_COUNTERS=y 
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_PCI_QUIRKS=y

CONFIG_SLUB_DEBUG=y

# CONFIG_COMPAT_BRK is not set

# CONFIG_SLAB is not set

CONFIG_SLUB=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

CONFIG_PROFILING=y

CONFIG_TRACEPOINTS=y
@@ -239,6 +238,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 
CONFIG_SPARSEMEM_VMEMMAP=y

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_COMPACTION is not set

CONFIG_MIGRATION=y

CONFIG_PHYS_ADDR_T_64BIT=y

CONFIG_ZONE_DMA_FLAG=0
@@ -351,6 +351,7 @@ CONFIG_IPV6_TUNNEL=m 
# CONFIG_RDS is not set

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_L2TP is not set

# CONFIG_BRIDGE is not set

# CONFIG_NET_DSA is not set

CONFIG_VLAN_8021Q=m
@@ -367,6 +368,7 @@ CONFIG_VLAN_8021Q=m 
# CONFIG_IEEE802154 is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set

CONFIG_RPS=y



#

# Network testing
@@ -386,9 +388,14 @@ CONFIG_WIRELESS=y 
#

# CFG80211 needs to be enabled for MAC80211

#



#

# Some wireless drivers require a rate control algorithm

#

# CONFIG_WIMAX is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set

# CONFIG_CAIF is not set



#

# Device Drivers
@@ -658,6 +665,7 @@ CONFIG_PHYLIB=m 
# CONFIG_NATIONAL_PHY is not set

# CONFIG_STE10XP is not set

# CONFIG_LSI_ET1011C_PHY is not set

# CONFIG_MICREL_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=m
@@ -734,6 +742,8 @@ CONFIG_NETDEV_10000=y 
# CONFIG_CHELSIO_T1 is not set

CONFIG_CHELSIO_T3_DEPENDS=y

# CONFIG_CHELSIO_T3 is not set

CONFIG_CHELSIO_T4_DEPENDS=y

# CONFIG_CHELSIO_T4 is not set

# CONFIG_ENIC is not set

# CONFIG_IXGBE is not set

# CONFIG_IXGBEVF is not set
@@ -766,6 +776,7 @@ CONFIG_NIU=m 
# CONFIG_USB_PEGASUS is not set

# CONFIG_USB_RTL8150 is not set

# CONFIG_USB_USBNET is not set

# CONFIG_USB_IPHETH is not set

# CONFIG_WAN is not set

# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set
@@ -778,7 +789,6 @@ CONFIG_PPP_DEFLATE=m 
CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_MPPE=m

CONFIG_PPPOE=m

# CONFIG_PPPOL2TP is not set

# CONFIG_SLIP is not set

CONFIG_SLHC=m

# CONFIG_NET_FC is not set
@@ -816,6 +826,7 @@ CONFIG_INPUT_KEYBOARD=y 
CONFIG_KEYBOARD_ATKBD=y

# CONFIG_QT2160 is not set

CONFIG_KEYBOARD_LKKBD=m

# CONFIG_KEYBOARD_TCA6416 is not set

# CONFIG_KEYBOARD_MAX7359 is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_OPENCORES is not set
@@ -840,6 +851,7 @@ CONFIG_MOUSE_SERIAL=y 
# CONFIG_INPUT_TABLET is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

CONFIG_INPUT_MISC=y

# CONFIG_INPUT_AD714X is not set

CONFIG_INPUT_SPARCSPKR=y

# CONFIG_INPUT_ATI_REMOTE is not set

# CONFIG_INPUT_ATI_REMOTE2 is not set
@@ -848,6 +860,7 @@ CONFIG_INPUT_SPARCSPKR=y 
# CONFIG_INPUT_YEALINK is not set

# CONFIG_INPUT_CM109 is not set

# CONFIG_INPUT_UINPUT is not set

# CONFIG_INPUT_PCF8574 is not set



#

# Hardware I/O ports
@@ -871,6 +884,7 @@ CONFIG_HW_CONSOLE=y 
# CONFIG_VT_HW_CONSOLE_BINDING is not set

# CONFIG_DEVKMEM is not set

# CONFIG_SERIAL_NONSTANDARD is not set

# CONFIG_N_GSM is not set

# CONFIG_NOZOMI is not set



#
@@ -893,6 +907,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_TIMBERDALE is not set

# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set

# CONFIG_SERIAL_ALTERA_JTAGUART is not set

# CONFIG_SERIAL_ALTERA_UART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

# CONFIG_LEGACY_PTYS is not set
@@ -1306,11 +1322,14 @@ CONFIG_USB_HIDDEV=y 
CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y

# CONFIG_HID_CANDO is not set

CONFIG_HID_CHERRY=y

CONFIG_HID_CHICONY=y

# CONFIG_HID_PRODIKEYS is not set

CONFIG_HID_CYPRESS=y

CONFIG_HID_DRAGONRISE=y

# CONFIG_DRAGONRISE_FF is not set

# CONFIG_HID_EGALAX is not set

CONFIG_HID_EZKEY=y

CONFIG_HID_KYE=y

CONFIG_HID_GYRATION=y
@@ -1328,7 +1347,9 @@ CONFIG_HID_ORTEK=y 
CONFIG_HID_PANTHERLORD=y

# CONFIG_PANTHERLORD_FF is not set

CONFIG_HID_PETALYNX=y

# CONFIG_HID_PICOLCD is not set

# CONFIG_HID_QUANTA is not set

# CONFIG_HID_ROCCAT_KONE is not set

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

# CONFIG_HID_STANTUM is not set
@@ -1342,6 +1363,7 @@ CONFIG_HID_THRUSTMASTER=y 
# CONFIG_THRUSTMASTER_FF is not set

CONFIG_HID_ZEROPLUS=y

# CONFIG_ZEROPLUS_FF is not set

# CONFIG_HID_ZYDACRON is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1356,7 +1378,6 @@ CONFIG_USB=y 
# CONFIG_USB_DEVICEFS is not set

# CONFIG_USB_DEVICE_CLASS is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_OTG is not set

# CONFIG_USB_MON is not set

# CONFIG_USB_WUSB is not set

# CONFIG_USB_WUSB_CBAF is not set
@@ -1521,10 +1542,6 @@ CONFIG_RTC_DRV_STARFIRE=y 
# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -1706,8 +1723,8 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 
CONFIG_SCHEDSTATS=y

# CONFIG_TIMER_STATS is not set

# CONFIG_DEBUG_OBJECTS is not set

# CONFIG_SLUB_DEBUG_ON is not set

# CONFIG_SLUB_STATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_KMEMLEAK is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set
@@ -1742,6 +1759,9 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y 
# CONFIG_DEBUG_PAGEALLOC is not set

CONFIG_NOP_TRACER=y

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y

CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y

CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
@@ -1769,12 +1789,12 @@ CONFIG_BLK_DEV_IO_TRACE=y 
# CONFIG_RING_BUFFER_BENCHMARK is not set

# CONFIG_DYNAMIC_DEBUG is not set

# CONFIG_DMA_API_DEBUG is not set

# CONFIG_ATOMIC64_SELFTEST is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_DCFLUSH is not set

# CONFIG_STACK_DEBUG is not set

# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set



#
@@ -1895,6 +1915,7 @@ CONFIG_CRYPTO_DEFLATE=y 
#

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_HW=y

# CONFIG_CRYPTO_DEV_NIAGARA2 is not set

# CONFIG_CRYPTO_DEV_HIFN_795X is not set

CONFIG_BINARY_PRINTF=y

arch/sparc/include/asm/cache.h

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 


#define L1_CACHE_SHIFT 5

#define L1_CACHE_BYTES 32

#define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1)))



#ifdef CONFIG_SPARC32

#define SMP_CACHE_BYTES_SHIFT 5

arch/sparc/include/asm/pgtable_32.h

+2 −3
Original line number Diff line number Diff line
@@ -142,13 +142,12 @@ BTFIXUPDEF_CALL_CONST(unsigned long, pgd_page_vaddr, pgd_t) 
#define pmd_page(pmd) BTFIXUP_CALL(pmd_page)(pmd)

#define pgd_page_vaddr(pgd) BTFIXUP_CALL(pgd_page_vaddr)(pgd)



BTFIXUPDEF_SETHI(none_mask)

BTFIXUPDEF_CALL_CONST(int, pte_present, pte_t)

BTFIXUPDEF_CALL(void, pte_clear, pte_t *)



static inline int pte_none(pte_t pte)

{

	return !(pte_val(pte) & ~BTFIXUP_SETHI(none_mask));

	return !pte_val(pte);

}



#define pte_present(pte) BTFIXUP_CALL(pte_present)(pte)
@@ -160,7 +159,7 @@ BTFIXUPDEF_CALL(void, pmd_clear, pmd_t *) 


static inline int pmd_none(pmd_t pmd)

{

	return !(pmd_val(pmd) & ~BTFIXUP_SETHI(none_mask));

	return !pmd_val(pmd);

}



#define pmd_bad(pmd) BTFIXUP_CALL(pmd_bad)(pmd)

arch/sparc/kernel/perf_event.c

+1 −0
Original line number Diff line number Diff line
@@ -657,6 +657,7 @@ static u64 maybe_change_configuration(struct cpu_hw_events *cpuc, u64 pcr) 
		cpuc->current_idx[i] = idx;



		enc = perf_event_get_enc(cpuc->events[i]);

		pcr &= ~mask_for_index(idx);

		pcr |= event_encoding(enc, idx);

	}

out: