aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc
AgeCommit message (Collapse)AuthorFilesLines
2009-12-08Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6Linus Torvalds24-54/+1468
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: sparc: Set UTS_MACHINE correctly. sparc,leon: init_leon srmmu cleanup sparc32: Remove early interrupt enable. sparc, leon: Added Aeroflex Gaisler entry in manufacturer_info structure sparc64: Faster early-boot framebuffer console. Revert "sparc: Make atomic locks raw" sparc: remove unused nfsd #includes sparc: Fixup last users of irq_chip->typename Added sparc_leon3_snooping_enabled() and converted extern inline to static inline No auxio on LEON apbuart: Use of_find_node_by_path to find root node. sparc: Replace old style lock initializer sparc: Make atomic locks raw apbuart: Fix build and missing driver unregister. apbuart: Kill dependency on deprecated Sparc-only PROM interfaces. apbuart: Fix build warning. sparc: Support for GRLIB APBUART serial port watchdog: Remove BKL from rio watchdog driver sparc: Remove BKL from apc sparc,leon: Sparc-Leon SMP support
2009-12-08Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds1-54/+1
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: of: merge of_find_all_nodes() implementations of: merge other miscellaneous prototypes of: merge of_*_flat_dt*() functions of: merge of_node_get(), of_node_put() and of_find_all_nodes() of: merge of_read_number() an of_read_ulong() of: merge of_node_*_flag() and set_node_proc_entry() of: merge struct boot_param_header from Microblaze and PowerPC of: add common header for flattened device tree representation of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h of: merge struct device_node of: merge phandle, ihandle and struct property of: Rework linux/of.h and asm/prom.h include ordering
2009-12-08Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6Linus Torvalds2-58/+1
* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits) security/tomoyo: Remove now unnecessary handling of security_sysctl. security/tomoyo: Add a special case to handle accesses through the internal proc mount. sysctl: Drop & in front of every proc_handler. sysctl: Remove CTL_NONE and CTL_UNNUMBERED sysctl: kill dead ctl_handler definitions. sysctl: Remove the last of the generic binary sysctl support sysctl net: Remove unused binary sysctl code sysctl security/tomoyo: Don't look at ctl_name sysctl arm: Remove binary sysctl support sysctl x86: Remove dead binary sysctl support sysctl sh: Remove dead binary sysctl support sysctl powerpc: Remove dead binary sysctl support sysctl ia64: Remove dead binary sysctl support sysctl s390: Remove dead sysctl binary support sysctl frv: Remove dead binary sysctl support sysctl mips/lasat: Remove dead binary sysctl support sysctl drivers: Remove dead binary sysctl support sysctl crypto: Remove dead binary sysctl support sysctl security/keys: Remove dead binary sysctl support sysctl kernel: Remove binary sysctl logic ...
2009-12-05sparc: Set UTS_MACHINE correctly.David S. Miller1-0/+2
"ARCH" can be just about anything, so we shouldn't end up with UTS_MACHINE of "sparc" in a 64-bit kernel build just because someone set the personality using 'sparc32' or similar. CONFIG_SPARC64 drives the compilation and therefore provides the definitive value, not "ARCH". This mirrors commit 8c6531f7a99f29ba8817ffb12cc9ecf190049bd6 (x86: correctly set UTS_MACHINE for "make ARCH=x86") Signed-off-by: David S. Miller <[email protected]>
2009-12-03Merge branch 'master' into for-2.6.33Jens Axboe7-14/+18
2009-12-02sparc,leon: init_leon srmmu cleanupKristoffer Glembo1-3/+1
Removed unused assignment and capitalized srmmu name for sparc_leon Signed-off-by: Kristoffer Glembo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-02sparc32: Remove early interrupt enable.Kristoffer Glembo1-3/+0
Enabling interrupts at this points causes the warning "start_kernel(): bug: interrupts were enabled early" to be printed in start_kernel(). Signed-off-by: Kristoffer Glembo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-02sparc, leon: Added Aeroflex Gaisler entry in manufacturer_info structureKristoffer Glembo1-0/+11
Signed-off-by: Kristoffer Glembo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-01Merge branch 'master' of ↵David S. Miller1-1/+1
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: net/mac80211/ht.c
2009-11-30Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds1-1/+1
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sunsu: Use sunserial_console_termios() in sunsu_console_setup(). sunsu: Pass true 'ignore_line' to console match when RSC or LOM console. serial: suncore: Fix RSC/LOM handling in sunserial_console_termios(). serial: suncore: Add 'ignore_line' argument to sunserial_console_match(). sunsu: Fix detection of SU ports which are RSC console or control. sunsab: Do not set sunsab_reg.cons right before registering minors. sparc64: Fix definition of VMEMMAP_SIZE.
2009-11-27sparc64: Faster early-boot framebuffer console.David S. Miller5-1/+692
Borrow the powerpc bootx text console driver. Signed-off-by: David S. Miller <[email protected]>
2009-11-26Revert "sparc: Make atomic locks raw"David S. Miller1-18/+18
This reverts commit 4df286e52917c95c415400367cfd523dfbb0f93a. Breaks the build as reported by Stephen Rothwell. Signed-off-by: David S. Miller <[email protected]>
2009-11-26block: add helpers to run flush_dcache_page() against a bio and a request's ↵Ilya Loginov2-0/+2
pages Mtdblock driver doesn't call flush_dcache_page for pages in request. So, this causes problems on architectures where the icache doesn't fill from the dcache or with dcache aliases. The patch fixes this. The ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE symbol was introduced to avoid pointless empty cache-thrashing loops on architectures for which flush_dcache_page() is a no-op. Every architecture was provided with this flush pages on architectires where ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE is equal 1 or do nothing otherwise. See "fix mtd_blkdevs problem with caches on some architectures" discussion on LKML for more information. Signed-off-by: Ilya Loginov <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Peter Horton <[email protected]> Cc: "Ed L. Cashin" <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-11-25sparc: remove unused nfsd #includesBoaz Harrosh1-5/+0
Some unused includes removed. In an effort to cleanup nfsd headers and move private definitions to source directory. Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-23sparc64: Fix definition of VMEMMAP_SIZE.David S. Miller1-1/+1
This was the cause of various boot failures on V480, V880, etc. systems. Kernel image memory was being overwritten because the vmemmap[] array was being sized to small. So if you had physical memory addresses past a certain point, the early bootup would spam all over variables in the kernel data section. The vmemmap mappings map page structs, not page struct pointers. And that was the key thinko in the macro definition. This was fixable thanks to the help, reports, and tireless patience of Hermann Lauer. Reported-by: Hermann Lauer <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-23Merge commit 'v2.6.32-rc8'Grant Likely9-17/+21
2009-11-18Merge branch 'master' of ↵David S. Miller15-76/+570
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig
2009-11-18sparc: Fixup last users of irq_chip->typenameThomas Gleixner2-5/+5
The typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-17Merge branch 'hostprogs-wmissing-prototypes' of ↵Linus Torvalds3-10/+10
git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc * 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc: Makefile: Add -Wmising-prototypes to HOSTCFLAGS oss: Mark loadhex static in hex2hex.c dtc: Mark various internal functions static dtc: Set "noinput" in the lexer to avoid an unused function drm: radeon: Mark several functions static in mkregtable arch/sparc/boot/*.c: Mark various internal functions static arch/powerpc/boot/addRamDisk.c: Mark several internal functions static arch/alpha/boot/tools/objstrip.c: Mark "usage" static Documentation/vm/page-types.c: Declare checked_open static genksyms: Mark is_reserved_word static kconfig: Mark various internal functions static kconfig: Make zconf.y work with current bison
2009-11-17Merge commit 'v2.6.32-rc7'Eric W. Biederman3-3/+7
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler gets a small bug fix and the sysctl tree where I am removing all sysctl strategy routines.
2009-11-16sparc: fix printk for change of variable typeStephen Rothwell1-1/+1
The clockevent mult field became a u32. Signed-off-by: Stephen Rothwell <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Peter Zijlstra <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2009-11-16Added sparc_leon3_snooping_enabled() and converted extern inline to static ↵Kristoffer Glembo1-5/+12
inline Signed-off-by: David S. Miller <[email protected]>
2009-11-16No auxio on LEONKristoffer Glembo1-0/+1
Do not probe for auxio register on SPARC LEON. Signed-off-by: Kristoffer Glembo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-15arch/sparc/boot/*.c: Mark various internal functions staticJosh Triplett3-10/+10
Signed-off-by: Josh Triplett <[email protected]>
2009-11-08sparc: Move of_set_property_mutex acquisition outside of devtree_lock grab.David S. Miller1-2/+2
Otherwise we try to sleep with preemption disabled, etc. Noticed by Thomas Gleixner. Signed-off-by: David S. Miller <[email protected]>
2009-11-08sparc64: replace parentheses in pmul()Roel Kluin1-1/+1
`>>' has a higher precedence than `?' so src2 evaluated to either 16 or 0 dependent on the bits set in rs2. Signed-off-by: Roel Kluin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-07sparc: Replace old style lock initializerThomas Gleixner1-2/+2
SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-06sparc: Make atomic locks rawThomas Gleixner1-18/+18
SPIN_LOCK_UNLOCKED is deprecated and the locks which protect the atomic operations have no dependency on other locks and the code is well tested so the conversion to a raw lock is safe. Make the lock array static while at it. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-06sysctl: sparc Use the compat_sys_sysctlEric W. Biederman2-58/+1
Now that we have a generic 32bit compatibility implementation there is no need for sparc to implement it's own. Acked-by: David S. Miller <[email protected]> Signed-off-by: Eric W. Biederman <[email protected]>
2009-11-05sparc64: Add a comment about why we only use certain memory barriers these days.David S. Miller1-0/+4
Based upon feedback from Mathieu Desnoyers. Signed-off-by: David S. Miller <[email protected]>
2009-11-04sparc64/PCI: drop PCI_CACHE_LINE_BYTESTejun Heo2-2/+7
sparc64 is now the only user of PCI_CACHE_LINE_BYTES. Drop it and set pci_dfl_cache_line_size from pcibios_init() instead and drop PCI_CACHE_LINE_BYTES handling from generic pci code. Orignally-From: David Miller <[email protected]> Signed-off-by: Tejun Heo <[email protected]> Signed-off-by: Jesse Barnes <[email protected]>
2009-11-02sparc: Remove BKL from apcThomas Gleixner1-27/+10
commit ab772027 (sparc: arch/sparc/kernel/apc.c to unlocked_ioctl) added lock/unlock_kernel() to the apc ioctl code. The code needs no serialization at all. Neither put/get_user nor the read/write access to the sbus devices require it. Remove BKL. cycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it as well. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-02sparc,leon: Sparc-Leon SMP supportKonrad Eisele11-3/+732
Support SMP for a Sparc-Leon multiprocessor system. Add Leon specific SMP code to arch/sparc/kernel/leon_smp.c. Signed-off-by: Konrad Eisele <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-10-29percpu: remove per_cpu__ prefix.Rusty Russell2-7/+7
Now that the return from alloc_percpu is compatible with the address of per-cpu vars, it makes sense to hand around the address of per-cpu variables. To make this sane, we remove the per_cpu__ prefix we used created to stop people accidentally using these vars directly. Now we have sparse, we can use that (next patch). tj: * Updated to convert stuff which were missed by or added after the original patch. * Kill per_cpu_var() macro. Signed-off-by: Rusty Russell <[email protected]> Signed-off-by: Tejun Heo <[email protected]> Reviewed-by: Christoph Lameter <[email protected]>
2009-10-15of: merge of_node_get(), of_node_put() and of_find_all_nodes()Grant Likely1-9/+0
Merge common code between Sparc, PowerPC and Microblaze. Sparc differs in the implementation at this point, so this patch uses a #ifdef to handle sparc differently for now. The merging of implementations will occur in a later patch Signed-off-by: Grant Likely <[email protected]> Acked-by: David S. Miller <[email protected]> Acked-by: Wolfram Sang <[email protected]> Acked-by: Michal Simek <[email protected]> Acked-by: Stephen Neuendorffer <[email protected]> Acked-by: Stephen Rothwell <[email protected]>
2009-10-15of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.hGrant Likely1-3/+0
Merge of common code duplicated between Sparc, PowerPC and Microblaze Signed-off-by: Grant Likely <[email protected]> Acked-by: David S. Miller <[email protected]> Acked-by: Wolfram Sang <[email protected]> Acked-by: Michal Simek <[email protected]> Acked-by: Stephen Neuendorffer <[email protected]> Acked-by: Stephen Rothwell <[email protected]>
2009-10-15of: merge struct device_nodeGrant Likely1-24/+0
Merge of common code duplicated between Sparc, PowerPC and Microblaze Signed-off-by: Grant Likely <[email protected]> Acked-by: David S. Miller <[email protected]> Acked-by: Wolfram Sang <[email protected]> Acked-by: Michal Simek <[email protected]> Acked-by: Stephen Neuendorffer <[email protected]> Acked-by: Stephen Rothwell <[email protected]>
2009-10-15of: merge phandle, ihandle and struct propertyGrant Likely1-12/+0
Merge of common code duplicated between Sparc, PowerPC and Microblaze Signed-off-by: Grant Likely <[email protected]> Acked-by: David S. Miller <[email protected]> Acked-by: Wolfram Sang <[email protected]> Acked-by: Michal Simek <[email protected]> Acked-by: Stephen Neuendorffer <[email protected]> Acked-by: Stephen Rothwell <[email protected]>
2009-10-15of: Rework linux/of.h and asm/prom.h include orderingGrant Likely1-6/+1
In preparation to prune things out of the Sparc, PowerPC and Microblaze asm/prom.h files, change the #include statements to ensure that even if asm/prom.h is included first, linux/of.h gets to determine the order in which files are processed. This patch adds a #include <linux/of.h> to each of the prom.h files *above* the multi-include protection macros to ensure that linux/of.h can define things before prom.h gets processed. At the end of the merge the cross dependencies between the files should be gone and a sane #include scheme can be restored. Signed-off-by: Grant Likely <[email protected]> Acked-by: David S. Miller <[email protected]> Acked-by: Wolfram Sang <[email protected]> Acked-by: Michal Simek <[email protected]> Acked-by: Stephen Neuendorffer <[email protected]> Acked-by: Stephen Rothwell <[email protected]>
2009-10-14sparc: Add missing __NR_recvmmsg define.David S. Miller1-1/+2
Signed-off-by: David S. Miller <[email protected]>
2009-10-13sparc64: Set IRQF_DISABLED on LDC channel IRQs.David S. Miller1-2/+2
With lots of virtual devices it's easy to generate a lot of events and chew up the kernel IRQ stack. Reported-by: hyl <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-10-12net: Introduce recvmmsg socket syscallArnaldo Carvalho de Melo2-3/+3
Meaning receive multiple messages, reducing the number of syscalls and net stack entry/exit operations. Next patches will introduce mechanisms where protocols that want to optimize this operation will provide an unlocked_recvmsg operation. This takes into account comments made by: . Paul Moore: sock_recvmsg is called only for the first datagram, sock_recvmsg_nosec is used for the rest. . Caitlin Bestler: recvmmsg now has a struct timespec timeout, that works in the same fashion as the ppoll one. If the underlying protocol returns a datagram with MSG_OOB set, this will make recvmmsg return right away with as many datagrams (+ the OOB one) it has received so far. . Rémi Denis-Courmont & Steven Whitehouse: If we receive N < vlen datagrams and then recvmsg returns an error, recvmmsg will return the successfully received datagrams, store the error and return it in the next call. This paves the way for a subsequent optimization, sk_prot->unlocked_recvmsg, where we will be able to acquire the lock only at batch start and end, not at every underlying recvmsg call. Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-10-12net: Generalize socket rx gap / receive queue overflow cmsgNeil Horman1-0/+2
Create a new socket level option to report number of queue overflows Recently I augmented the AF_PACKET protocol to report the number of frames lost on the socket receive queue between any two enqueued frames. This value was exported via a SOL_PACKET level cmsg. AFter I completed that work it was requested that this feature be generalized so that any datagram oriented socket could make use of this option. As such I've created this patch, It creates a new SOL_SOCKET level option called SO_RXQ_OVFL, which when enabled exports a SOL_SOCKET level cmsg that reports the nubmer of times the sk_receive_queue overflowed between any two given frames. It also augments the AF_PACKET protocol to take advantage of this new feature (as it previously did not touch sk->sk_drops, which this patch uses to record the overflow count). Tested successfully by me. Notes: 1) Unlike my previous patch, this patch simply records the sk_drops value, which is not a number of drops between packets, but rather a total number of drops. Deltas must be computed in user space. 2) While this patch currently works with datagram oriented protocols, it will also be accepted by non-datagram oriented protocols. I'm not sure if thats agreeable to everyone, but my argument in favor of doing so is that, for those protocols which aren't applicable to this option, sk_drops will always be zero, and reporting no drops on a receive queue that isn't used for those non-participating protocols seems reasonable to me. This also saves us having to code in a per-protocol opt in mechanism. 3) This applies cleanly to net-next assuming that commit 977750076d98c7ff6cbda51858bb5a5894a9d9ab (my af packet cmsg patch) is reverted Signed-off-by: Neil Horman <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-10-12this_cpu: Use this_cpu_xx in nmi handlingChristoph Lameter1-4/+4
this_cpu_inc/dec reduces the number of instructions needed. Signed-off-by: Christoph Lameter <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
2009-10-12sparc64: Fix D-cache flushing on swapin from SW devices.David S. Miller1-1/+1
Thanks to tip form ARM folks and Russell King. If flush_dcache_page() occurs on a swapin it will have a mapping and we'll try to defer the flush by setting the dirty bit. But when it hits update_dcache_page() we won't flush because the page won't have a mapping any more. So remove the mapping requirement in flush_dcache(). Signed-off-by: David S. Miller <[email protected]>
2009-10-09sparc64: Fix niagara2 perf IRQ bits.David S. Miller1-1/+1
Signed-off-by: David S. Miller <[email protected]>
2009-10-08Merge branch 'sparc-perf-events-fixes-for-linus' of ↵Linus Torvalds1-0/+2
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: mm, perf_event: Make vmalloc_user() align base kernel virtual address to SHMLBA perf_event: Provide vmalloc() based mmap() backing
2009-10-06perf_event: Provide vmalloc() based mmap() backingPeter Zijlstra1-0/+2
Some architectures such as Sparc, ARM and MIPS (basically everything with flush_dcache_page()) need to deal with dcache aliases by carefully placing pages in both kernel and user maps. These architectures typically have to use vmalloc_user() for this. However, on other architectures, vmalloc() is not needed and has the downsides of being more restricted and slower than regular allocations. Signed-off-by: Peter Zijlstra <[email protected]> Acked-by: David Miller <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Paul Mackerras <[email protected]> LKML-Reference: <1254830228.21044.272.camel@laptop> Signed-off-by: Ingo Molnar <[email protected]>
2009-10-05Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds6-59/+547
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: using HZ needs an include of linux/param.h sparc32: convert to asm-generic/hardirq.h sparc64: Cache per-cpu %pcr register value in perf code. sparc64: Fix comment typo in perf_event.c sparc64: Minor coding style fixups in perf code. sparc64: Add a basic conflict engine in preparation for multi-counter support. sparc64: Increase vmalloc size to fix percpu regressions. sparc64: Add initial perf event conflict resolution and checks. sparc: Niagara1 perf event support. sparc: Add Niagara2 HW cache event support. sparc: Support all ultra3 and ultra4 derivatives. sparc: Support HW cache events.
2009-10-05sparc: using HZ needs an include of linux/param.hStephen Rothwell1-0/+1
Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.