summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mailmap: Fix up some renesas attributionsKuninori Morimoto2011-11-111-0/+2
| | | | | | | | | This adds in entries for both Goda and Morimoto-san who have previously used different conventions. Cc: Yusuke Goda <yusuke.goda.sx@renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
*-. Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linusPaul Mundt2011-11-113472-35672/+65364
|\ \
| | * sh: clkfwk: Kill off remaining debugfs cruft.Paul Mundt2011-11-112-88/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that all of the named string association with clocks has been migrated to clkdev lookups there's no meaningful named topology that can be constructed for a debugfs tree view. Get rid of the left over bits, and shrink struct clk a bit in the process. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * sh: clkfwk: add clk_rate_mult_range_round()Kuninori Morimoto2011-11-052-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | This provides a clk_rate_mult_range_round() helper for use by some of the CPG PLL ranged multipliers, following the same approach as used by the div ranges. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | drivers: sh: Kill off dead pathname for runtime PM stub.Paul Mundt2011-11-111-3/+1
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | drivers: sh: Generalize runtime PM platform stub.Paul Mundt2011-11-113-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The runtime PM platform support stub in use by ARM-based SH/R-Mobile platforms contains nothing that's specifically ARM-related and instead of wholly generic to anything using the clock framework. The recent runtime PM changes interact rather badly with the lazy disabling of clocks late in the boot process through the clock framework, leading to situations where the runtime suspend/resume paths are entered without a clock being actively driven due to having been lazily gated off. In order to correct this we can trivially tie in the aforementioned stub as a general fallback for all SH platforms that don't presently have their own runtime PM implementations (the corner case being SH-based SH-Mobile platforms, which have their own stub through the hwblk API -- which in turn has bitrotted and will be subsequently adapted to use the same stub as everyone else), regardless of whether the platforms choose to define power domains of their own or not. This fixes up regressions for clock framework users who also build in runtime PM support without any specific power domains of their own, which was previously causing the serial console to be lost when warring with lazy clock disabling. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | Revert "proc: fix races against execve() of /proc/PID/fd**"Linus Torvalds2011-11-091-103/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit aa6afca5bcaba8101f3ea09d5c3e4100b2b9f0e5. It escalates of some of the google-chrome SELinux problems with ptrace ("Check failed: pid_ > 0. Did not find zygote process"), and Andrew says that it is also causing mystery lockdep reports. Reported-by: Alex Villacís Lasso <a_villacis@palosanto.com> Requested-by: James Morris <jmorris@namei.org> Requested-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | Merge branch 'for-linus' of ↵Linus Torvalds2011-11-085-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: drivers/media: video/a5k6aa is a module and so needs module.h mfd: fix build failures in recently added ab5500 code hwspinlock/u8500: include linux/module.h MTD: MAPS: bcm963xx-flash.c: explicitly include module.h
| | * | drivers/media: video/a5k6aa is a module and so needs module.hPaul Gortmaker2011-11-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This file uses core functions like module_init() and module_exit() and so it explicitly needs to include the module.h header. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| | * | mfd: fix build failures in recently added ab5500 codePaul Gortmaker2011-11-072-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files had implicit dependencies on modular support which now show up as build failures with the module cleanup work merged to mainline. Reported-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| | * | hwspinlock/u8500: include linux/module.hAxel Lin2011-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include module.h to fix below build error: CC drivers/hwspinlock/u8500_hsem.o drivers/hwspinlock/u8500_hsem.c:177: error: 'THIS_MODULE' undeclared here (not in a function) [...] drivers/hwspinlock/u8500_hsem.c:196: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' drivers/hwspinlock/u8500_hsem.c:196: warning: function declaration isn't a prototype make[2]: *** [drivers/hwspinlock/u8500_hsem.o] Error 1 make[1]: *** [drivers/hwspinlock] Error 2 make: *** [drivers] Error 2 Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| | * | MTD: MAPS: bcm963xx-flash.c: explicitly include module.hJonas Gorski2011-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | module.h was previously implicitly included through mtd/mtd.h. Fixes the following build failure after the module.h cleanup: CC drivers/mtd/maps/bcm963xx-flash.o drivers/mtd/maps/bcm963xx-flash.c: In function 'bcm963xx_probe': drivers/mtd/maps/bcm963xx-flash.c:208:29: error: 'THIS_MODULE' undeclared (first use in this function) [...] drivers/mtd/maps/bcm963xx-flash.c:276:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' drivers/mtd/maps/bcm963xx-flash.c:276:15: warning: function declaration isn't a prototype make[7]: *** [drivers/mtd/maps/bcm963xx-flash.o] Error 1 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| * | | Merge branch 'for-linus' of git://neil.brown.name/mdLinus Torvalds2011-11-081-6/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://neil.brown.name/md: md/raid5: STRIPE_ACTIVE has lock semantics, add barriers md/raid5: abort any pending parity operations when array fails.
| | * | | md/raid5: STRIPE_ACTIVE has lock semantics, add barriersDan Williams2011-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All updates that occur under STRIPE_ACTIVE should be globally visible when STRIPE_ACTIVE clears. test_and_set_bit() implies a barrier, but clear_bit() does not. This is suitable for 3.1-stable. Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: NeilBrown <neilb@suse.de> Cc: stable@kernel.org
| | * | | md/raid5: abort any pending parity operations when array fails.NeilBrown2011-11-081-4/+8
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the number of failed devices exceeds the allowed number we must abort any active parity operations (checks or updates) as they are no longer meaningful, and can lead to a BUG_ON in handle_parity_checks6. This bug was introduce by commit 6c0069c0ae9659e3a91b68eaed06a5c6c37f45c8 in 2.6.29. Reported-by: Manish Katiyar <mkatiyar@gmail.com> Tested-by: Manish Katiyar <mkatiyar@gmail.com> Acked-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: NeilBrown <neilb@suse.de> Cc: stable@kernel.org
| * | | Merge branch 'docs-move' of ↵Linus Torvalds2011-11-082-142/+170
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs * 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs: (45 commits) DocBook/drm: Clean up a todo-note DocBook/drm: `device aware' -> `device-aware' DocBook/drm: `(device|driver) specific' -> `(device|driver)-specific' DocBook/drm: Clean up the paragraph on framebuffer objects DocBook/drm: Use `; otherwise,' DocBook/drm: Better flow with `, and then' DocBook/drm: Refer to the domain-setting function as a device-specific ioctl DocBook/drm: Improve flow of GPU/CPU coherence sentence DocBook/drm: Use an <itemizelist> for fundamental GEM operations DocBook/drm: Insert a comma DocBook/drm: Use a <variablelist> for vblank ioctls DocBook/drm: Use an itemizedlist for what an encoder needs to provide DocBook/drm: Insert `the' for readability, and change `set' to `setting' DocBook/drm: Remove extraneous commas DocBook/drm: Use a colon DocBook/drm: Clarify `final initialization' via better formatting DocBook/drm: Remove redundancy DocBook/drm: Insert `it' for smooth reading DocBook/drm: The word `so-called'; I do not think it connotes what you think it connotes DocBook/drm: Use a singular subject for grammatical cleanliness ...
| | * \ \ Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into ↵Randy Dunlap2011-11-062-142/+170
| | |\ \ \ | | | | | | | | | | | | | | | | | | docs-move
| | | * | | DocBook/drm: Clean up a todo-noteMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: `device aware' -> `device-aware'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: `(device|driver) specific' -> `(device|driver)-specific'Michael Witten2011-08-291-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Clean up the paragraph on framebuffer objectsMichael Witten2011-08-291-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Use `; otherwise,'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Better flow with `, and then'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Refer to the domain-setting function as a device-specific ioctlMichael Witten2011-08-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Improve flow of GPU/CPU coherence sentenceMichael Witten2011-08-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Use an <itemizelist> for fundamental GEM operationsMichael Witten2011-08-291-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Insert a commaMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Use a <variablelist> for vblank ioctlsMichael Witten2011-08-291-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Use an itemizedlist for what an encoder needs to provideMichael Witten2011-08-291-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Insert `the' for readability, and change `set' to `setting'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Remove extraneous commasMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Use a colonMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Clarify `final initialization' via better formattingMichael Witten2011-08-291-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Remove redundancyMichael Witten2011-08-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Insert `it' for smooth readingMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: The word `so-called'; I do not think it connotes what you think ↵Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it connotes From Webster's Revised Unabridged Dictionary (1913) [web1913]: So-called \So"-called`\, a. So named; called by such a name (but perhaps called thus with doubtful propriety). From WordNet (r) 2.0 [wn]: so-called adj : doubtful or suspect; "these so-called experts are no help" [syn: {alleged(a)}, {supposed}] My strong conviction is that widespread use of 'so gennant' or 'sogennant' in German has led to the creeping misuse of 'so-called' in English (especially through technical writings). In English, it would be better to use: what is called or a better translation of 'so gennant': so named Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Use a singular subject for grammatical cleanlinessMichael Witten2011-08-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: basic -> coreMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Streamline wording of GEM initializationMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Insert `()' after function nameMichael Witten2011-08-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Remove parentheses and unnecessary repetitionMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Insert missing commaMichael Witten2011-08-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: , -> :Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: can -> couldMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Offset modifiers with commasMichael Witten2011-08-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Use the passive voiceMichael Witten2011-08-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: `at driver load time' -> `when the driver is loaded'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: `setup' is the noun; `to set up' is the verbMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Insert missing `an'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | | * | | DocBook/drm: Insert missing `that'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>