aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-05-25slub: Fix double bit unlock in debug modeChristoph Lameter1-1/+2
Commit 442b06bcea23 ("slub: Remove node check in slab_free") added a call to deactivate_slab() in the debug case in __slab_alloc(), which unlocks the current slab used for allocation. Going to the label 'unlock_out' then does it again. Also, in the debug case we do not need all the other processing that the 'unlock_out' path does. We always fall back to the slow path in the debug case. So the tid update is useless. Similarly, ALLOC_SLOWPATH would just be incremented for all allocations. Also a pretty useless thing. So simply restore irq flags and return the object. Signed-off-by: Christoph Lameter <[email protected]> Reported-and-bisected-by: James Morris <[email protected]> Reported-by: Ingo Molnar <[email protected]> Reported-by: Jens Axboe <[email protected]> Cc: Pekka Enberg <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-259p: update Documentation pointersEric Van Hensbergen1-19/+10
Update documentation pointers to include virtfs publication, 9p RFC as well as updated list of servers and alternative clients. Signed-off-by: Eric Van Hensbergen <[email protected]>
2011-05-25net/9p: enable 9p to work in non-default network namespaceRob Landley1-3/+4
Teach 9p filesystem to work in container with non-default network namespace. (Note: I also patched the unix domain socket code but don't have a test case for that. It's the same fix, I just don't have a server for it...) To test, run diod server (http://code.google.com/p/diod): diod -n -f -L stderr -l 172.23.255.1:9999 -c /dev/null -e /root and then mount like so: mount -t 9p -o port=9999,aname=/root,version=9p2000.L 172.23.255.1 /mnt A container test environment is described at http://landley.net/lxc Signed-off-by: Rob Landley <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2011-05-25net/9p: p9_idpool_get return -1 on errorAneesh Kumar K.V2-9/+13
We need to return -1 on error. Also handle error properly Signed-off-by: Aneesh Kumar K.V <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2011-05-25fs/9p: Don't clunk dentry fid when we fail to get a writeback inodeAneesh Kumar K.V1-5/+6
The dentry fid get clunked via the dput. Signed-off-by: Aneesh Kumar K.V <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2011-05-259p: Small cleanup in <net/9p/9p.h>Sasha Levin1-2/+1
There are two small cleanups in this patch: - p9_errstr2errno was declared twice - remove one declaration. - A uint8_t type was mixed in, change it to u8 to match with the rest of the type names and remove dependency. Cc: Eric Van Hensbergen <[email protected]> Cc: Ron Minnich <[email protected]> Cc: Latchesar Ionkov <[email protected]> Cc: Pekka Enberg <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2011-05-259p: remove experimental tag from tested configurationsEric Van Hensbergen2-7/+6
The 9p client is currently undergoing regular regresssion and stress testing as a by-product of the virtfs work. I think its finally time to take off the experimental tags from the well-tested code paths. Signed-off-by: Eric Van Hensbergen <[email protected]>
2011-05-259p: typo fixes and minor cleanupsRob Landley4-12/+13
Typo fixes and minor cleanups for v9fs Signed-off-by: Rob Landley <[email protected]> Reviewed-by: Venkateswararao Jujjuri (JV) <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2011-05-25net/9p: Change linuxdoc names to match functions.Rob Landley1-2/+2
As on Jeopardy, my question is in the form of a patch: Does this have some special meaning, or is it an accident? (I looked at other filesystems but they didn't bother having doc entries for their init/exit function that I could find.) Signed-off-by: Rob Landley <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
2011-05-25xconfig: merge code path to conf_write()Arnaud Lacombe1-3/+2
Avoid to have multiple path saving the config. This fixes an error check miss when the window is being closed and the user requested the config to be written. Reported-by: Hiromu Yakura <[email protected]> Pointed-out-by: Michal Marek <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-05-25Blackfin: use new common PERCPU_INPUT defineMike Frysinger1-7/+1
The Blackfin percpu input sections are outdated, so rather than update them, drop them completely and use the new common define. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25MAINTAINERS: Fix Analog Devices mailinglist addressLars-Peter Clausen1-10/+10
There is a small typo in the Analog Devices driver mailinglist address. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Michael Hennerich <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: boards: update ASoC resources after machine driver overhaulScott Jiang4-17/+273
Now that the Blackfin machine drivers have been updated to the multicomponent support, update the resources to match. The pin settings are now a board issue and removed from the driver. Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: work around anomaly 05000480Steven Miao1-0/+5
Anomaly 05000480 on BF537 rev 0.0, 0.1, 0.2: Multiple Simultaneous Urgent DMA Requests May Cause DMA System Instability Suggested Workaround: Program the DMA Traffic Control Period to a non-zero value. This forces the DMA block to group accesses together rather than allow arbitration for each piece of data placed on the internal DMA bus. Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: fix addr type with bfin_write_{or,and} helpersMike Frysinger1-2/+2
Since the bfin_write() func needs proper type information in order to expand into the right bfin_writeX() variant, preserve the addr's type when setting up the local __addr. Otherwise the helpers will detect the variant based upon sizeof(void) which is almost never right. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: convert /proc/sram to seq_fileAlexey Dobriyan1-17/+26
->read_proc interface is going away, switch to seq_file. Signed-off-by: Alexey Dobriyan <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: switch /proc/gpio to seq_fileAlexey Dobriyan1-11/+20
->read_proc interface is going away, switch to seq_file. Signed-off-by: Alexey Dobriyan <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: fix indentation with bfin_read() helperMike Frysinger1-4/+4
Use tabs instead of spaces to indent. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: convert old cpumask API to new oneKOSAKI Motohiro4-22/+24
old cpu_xxx() APIs is planned to removed later. then, converted. Signed-off-by: KOSAKI Motohiro <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: don't touch task->cpus_allowed directlyKOSAKI Motohiro1-4/+2
Every callter (except kthread_bind) should use proper set_cpus_allowed_ptr() APIs. Signed-off-by: KOSAKI Motohiro <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: don't touch cpu_possible_map and cpu_present_map directlyKOSAKI Motohiro1-4/+10
We plan to remove cpu_possible_map and cpu_present_map later and we have proper init_cpu_possible() and init_cpu_present() APIs. Therefore this patch rewrites platform_init_cpus and platform_prepare_cpus by their APIs. Signed-off-by: KOSAKI Motohiro <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: bf548-ezkit/bf561-ezkit: update nor flash layoutMike Frysinger2-2/+18
Both the BF548-EZKIT and the BF561-EZKIT use top boot flashes, so now that Das U-Boot uses the last small sector for its environment, update their nor layout in the kernel accordingly. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: initial perf_event supportMike Frysinger5-0/+546
Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: update anomaly lists to latest public infoMike Frysinger7-15/+50
Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: use on-chip reset func with newer partsMike Frysinger1-34/+31
Turns out the documentation is wrong and doing "RAISE 1" does not result in a software reset, only a core reset. So when the on-chip rom has a functioning reset helper, use it. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: bf533-stamp/bf537-stamp: drop ad1980 from defconfigsMike Frysinger2-4/+0
These boards don't have AD1980 modules, and that device is deprecated, so don't bother building it up by default anymore. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: optimize MMR reads during startup a bitMike Frysinger1-11/+9
Since the value of these MMRs aren't changing, store the value in a local variable and work off of that. This avoids multiple MMR reads which are implicitly forced by the volatile markings. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: bf537: demux port H mask A and emac rx intsMike Frysinger5-20/+77
The BF537 SIC combines the gpio port H mask A interrupts with the emac rx interrupt, so we need to demux this in software. It also combines the gpio port H mask B and the emac tx interrupts, and the watchdog and port F mask B interrupts, but since we don't support mask B yet, just add the defines for now. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: bf537: fix excessive gpio int demuxingMike Frysinger1-30/+25
The search logic in the gpio demux walks all possible gpio blocks starting at the specified pin. The trouble on bf537 parts when we demux the port F and port G mask A interrupts is that we also demux port H mask A ints. Most of the time this isn't an issue as people don't usually use port H, but might as well avoid it when possible. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: bf54x: drop unused pm gpio handlingMike Frysinger1-40/+2
This functionality was merged into the common bfin_pm_standby_ctrl func some time ago, so punt these now unused funcs and data, and localize the wake funcs that aren't needed externally anymore. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: move bf537-specific irq code out of common codeMike Frysinger4-138/+150
The SIC interrupt line muxing that the bf537 does is specific to this CPU (thankfully), so rip it out of the common code and move it to a bf537-specific file. This tidies up the common code significantly. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: move internal irq prototypes out of global namespaceMike Frysinger8-10/+16
These are only used in a few internal Blackfin places, so move the irq prototypes out of the global header and into the internal irq one. No functional changes other than shuffling locales. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: clean up irq ifdef logic a bitMike Frysinger1-47/+39
Prefer MMR named checks over part-specific lists, condense duplicated code across different #ifdef branches, simplify CONFIG_PM ifdefs, and drop unused kgdb header. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: bf51x/bf52x: fix typo in hysteresis MMR namesMike Frysinger5-28/+28
Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: delete duplicated user single step prototypesMike Frysinger1-2/+0
These are in linux/ptrace.h, so no need for us to duplicate them. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: kgdb: cache flushing is not safe in SMP modeSonic Zhang1-1/+5
Make sure we mark cache flushing as unsafe to kgdb in SMP mode so that kgdb doesn't flush things incorrectly on us. Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: SMP: drop unused blackfin_cpudata.idle pointerMike Frysinger2-4/+0
Not sure when we stopped using this field, but nothing in the tree uses this now, so punt it. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: SMP: fix cpudata cache setupMike Frysinger2-5/+2
After some cache setup reordering changesets, the blackfin_cpudata init was left behind. While cpu0's data was correct, cpu1's data was not. Not that big of a deal as these are only used in the cpuinfo output, but should still be fixed. So move the setup of these fields to the common cache setup function to avoid this happening again in the future. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: clean up /proc/cpuinfo outputMike Frysinger1-8/+8
The smp flush lines are too long and have too many newlines, so scale them back to match the other lines. The %p modifier shows "(null)" for 0, so use %08x instead. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: bf527-ezkit: tweak sound defconfigMike Frysinger2-15/+11
Build the sound pieces that the board actually has into the kernel, and punt older devices that we discourage. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: bf533/bf537/bf561: convert to BFIN_IRQ helperMike Frysinger3-122/+121
This brings the parts in line with newer ones, and makes things easier to read at a glance. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: clean up style in irq definesMike Frysinger7-695/+627
These files had a lot of whitespace damage, mostly due to copying and pasting original files that had damage. The BF561 header also had a lot of unused CONFIG_DEF_xxx defines, so punt them all. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: unify core IRQ definitionsMike Frysinger8-379/+64
Start a new common IRQ header and move all of the CEC pieces there. This lets the individual part headers worry just about its SIC defines. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: ints-priority: unify duplicate vec to irq lookup logicMike Frysinger1-68/+44
Seems the ipipe code just copied & pasted the existing irq lookup logic, so pull the logic out of do_irq() and into a local helper, and convert the two users over to that. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: ints-priority: clean up some local varsMike Frysinger1-17/+8
The local ivg structs need not be exported, so mark them as static. Further, the "num_spurious" variable is only incremented and never actually read anywhere, so punt it. Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: don't attempt to flush on-chip L1 SRAM regionsSonic Zhang1-5/+18
Since the on-chip L1 regions are not cacheable, there is no point in trying to flush/invalidate them. Plus, older Blackfin parts like to trigger an exception (like BF533-0.3). Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25Blackfin: first pass at debug mmr supportMike Frysinger3-1/+1863
Signed-off-by: Mike Frysinger <[email protected]>
2011-05-25ARM: mach-shmobile: mackerel: add renesas_usbhs support for USB1Kuninori Morimoto1-1/+190
renesas_usbhs driver can use external interrupt mode (which come from USB-PHY) or autonomy mode (it use own interrupt) for detecting connection/disconnection when Function. And it will be power OFF while it has been disconnecting if external interrupt mode is selected. mackerel board has 2 USB ports. But we can not use external interrupt mode on CN22 USB0 port which is only for USB Function. IRQ7-PORT40 is already used by Touchscreen, and USB-PHY needs IRQ7-PORT167. It is impossible to use IRQ7 demux on mackerel. We can use external interrupt mode USB-Function on "USB1". USB1 can become Host by r8a66597, and become Function by renesas_usbhs. But don't select both drivers in same time. These 2 drivers are not supporting IRQ SHARD. Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-05-25Merge branch 'common/fbdev-meram' of ↵Paul Mundt1-1/+2
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2011-05-25ARM: mach-shmobile: Correct the G4EVM SDHI0 I/O range.Paul Mundt1-1/+1
This obviously should have been 0xe6d500ff, fix it up accordingly. Signed-off-by: Paul Mundt <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.