991d79b0d1255f89267a350b0048eca59f100cbb a8f90e906783f1f815120eefe813b23cb396e9bd Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/7fa07729e439a6184bd824746d06a49cca553f15 7fa07729e439a6184bd824746d06a49cca553f15 2009-09-22T08:11:04-07:00 2009-09-22T08:11:04-07:00 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf_event, powerpc: Fix compilation after big perf_counter rename 9037f5c36d64f842a030a1284f76a354ef6f76e6 Linus Torvalds torvalds@linux-foundation.org a87e84b5cdfacf11af4e8a85c4bca9793658536f 181f7c5dd3832763bdf2756b6d2d8a49bdf12791 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/991d79b0d1255f89267a350b0048eca59f100cbb 991d79b0d1255f89267a350b0048eca59f100cbb 2009-09-22T08:07:54-07:00 2009-09-22T08:07:54-07:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck: kmemcheck: add missing braces to do-while in kmemcheck_annotate_bitfield kmemcheck: update documentation kmemcheck: depend on HAVE_ARCH_KMEMCHECK kmemcheck: remove useless check kmemcheck: remove duplicated #include 65ddf4160f959952d9f4955fda8844374768b83e Linus Torvalds torvalds@linux-foundation.org 342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca 3c394ddaa7ea4205f933fd9b481166b2669368a9 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/a87e84b5cdfacf11af4e8a85c4bca9793658536f a87e84b5cdfacf11af4e8a85c4bca9793658536f 2009-09-22T07:54:33-07:00 2009-09-22T07:54:33-07:00 Merge branch 'for-2.6.32' of git://linux-nfs.org/~bfields/linux * 'for-2.6.32' of git://linux-nfs.org/~bfields/linux: (68 commits) nfsd4: nfsv4 clients should cross mountpoints nfsd: revise 4.1 status documentation sunrpc/cache: avoid variable over-loading in cache_defer_req sunrpc/cache: use list_del_init for the list_head entries in cache_deferred_req nfsd: return success for non-NFS4 nfs4_state_start nfsd41: Refactor create_client() nfsd41: modify nfsd4.1 backchannel to use new xprt class nfsd41: Backchannel: Implement cb_recall over NFSv4.1 nfsd41: Backchannel: cb_sequence callback nfsd41: Backchannel: Setup sequence information nfsd41: Backchannel: Server backchannel RPC wait queue nfsd41: Backchannel: Add sequence arguments to callback RPC arguments nfsd41: Backchannel: callback infrastructure nfsd4: use common rpc_cred for all callbacks nfsd4: allow nfs4 state startup to fail SUNRPC: Defer the auth_gss upcall when the RPC call is asynchronous nfsd4: fix null dereference creating nfsv4 callback client nfsd4: fix whitespace in NFSPROC4_CLNT_CB_NULL definition nfsd41: sunrpc: add new xprt class for nfsv4.1 backchannel sunrpc/cache: simplify cache_fresh_locked and cache_fresh_unlocked. ... f8e3cb2d339d8ed0e987d55f725e501730cdc81d Linus Torvalds torvalds@linux-foundation.org 50223e486cabdcf7e540e519da1f26bab3084e5d 24ed7a97464db44592495f98cff8bcee02f92bc2 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca 342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca 2009-09-22T07:51:45-07:00 2009-09-22T07:51:45-07:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits) trivial: fix typo in aic7xxx comment trivial: fix comment typo in drivers/ata/pata_hpt37x.c trivial: typo in kernel-parameters.txt trivial: fix typo in tracing documentation trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c trivial: remove unnecessary semicolons trivial: Fix duplicated word "options" in comment trivial: kbuild: remove extraneous blank line after declaration of usage() trivial: improve help text for mm debug config options trivial: doc: hpfall: accept disk device to unload as argument trivial: doc: hpfall: reduce risk that hpfall can do harm trivial: SubmittingPatches: Fix reference to renumbered step trivial: fix typos "man[ae]g?ment" -> "management" trivial: media/video/cx88: add __init/__exit macros to cx88 drivers trivial: fix typo in CONFIG_DEBUG_FS in gcov doc trivial: fix missing printk space in amd_k7_smp_check trivial: fix typo s/ketymap/keymap/ in comment trivial: fix typo "to to" in multiple files trivial: fix typos in comments s/DGBU/DBGU/ ... 1f967f283dade6e03897169bb29513354f49f910 Linus Torvalds torvalds@linux-foundation.org e258b80e691f1f3ae83a60aa80eaf7322bd55ec4 a2d693cf650f000ea22351484ee66cf4c2651eef Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/50223e486cabdcf7e540e519da1f26bab3084e5d 50223e486cabdcf7e540e519da1f26bab3084e5d 2009-09-22T07:51:28-07:00 2009-09-22T07:51:28-07:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: Remove duplicate Kconfig entry HID: consolidate connect and disconnect into core code HID: fix non-atomic allocation in hid_input_report c5eedda167c7ea83e342f80a9344646c7a99ba35 Linus Torvalds torvalds@linux-foundation.org abd6633c67925f90775bb74755f9c547e30f1f20 David Härdeman david@hardeman.nu http://github.com/github/linux-2.6/commit/e258b80e691f1f3ae83a60aa80eaf7322bd55ec4 e258b80e691f1f3ae83a60aa80eaf7322bd55ec4 2009-09-22T07:17:49-07:00 2009-09-21T17:04:53-07:00 input: add a driver for the Winbond WPCD376I Consumer IR hardware Add a driver for the the Consumer IR (CIR) functionality of the Winbond WPCD376I chipset (found on e.g. Intel DG45FC motherboards). Signed-off-by: David Härdeman <david@hardeman.nu> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Cc: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2233f4d43dede000a210db87733e04c912fdcb31 Linus Torvalds torvalds@linux-foundation.org a976f150a6953da5ccbd40fa6dba3bd7d56f9f67 David Härdeman david@hardeman.nu http://github.com/github/linux-2.6/commit/abd6633c67925f90775bb74755f9c547e30f1f20 abd6633c67925f90775bb74755f9c547e30f1f20 2009-09-22T07:17:49-07:00 2009-09-21T17:04:52-07:00 pnp: add a shutdown method to pnp drivers The shutdown method is used by the winbond cir driver to setup the hardware for wake-from-S5. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: David Härdeman <david@hardeman.nu> Cc: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 9cb974febc1a30e3914720655cd406cea84c063e Linus Torvalds torvalds@linux-foundation.org 560a64a2b501add585b494b2b9cd9f68c0636b50 Henrik Rydberg rydberg@euromail.se http://github.com/github/linux-2.6/commit/a976f150a6953da5ccbd40fa6dba3bd7d56f9f67 a976f150a6953da5ccbd40fa6dba3bd7d56f9f67 2009-09-22T07:17:49-07:00 2009-09-21T17:04:50-07:00 hwmon: applesmc: restore accelerometer and keyboard backlight on resume On resume from suspend, the driver currently resets the logical state as if it was brought up from halt. This patch uses the dev_pm_ops.resume/restore methods to synchronize the hardware with the memorized logical state, in effect bringing back the accelerometer and backlight to the state prior to suspend. Works for both suspend to ram and hibernation. The patch has zero effect on the running state. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Cc: Nicolas Boichat <nicolas@boichat.ch> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 36c0c1b9d424649421dde1f1d553bd17179a5264 Linus Torvalds torvalds@linux-foundation.org 905ffdc35e50844ab45bbc59d5302238844f8526 Roel Kluin roel.kluin@gmail.com http://github.com/github/linux-2.6/commit/560a64a2b501add585b494b2b9cd9f68c0636b50 560a64a2b501add585b494b2b9cd9f68c0636b50 2009-09-22T07:17:49-07:00 2009-09-21T17:04:48-07:00 hwmon: fix freeing of gpio_data and irq If already requested, gpio_data and irq should be freed in the case of an error. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 76ff9e60110a388e551f17b2071405eeea5f1c71 Linus Torvalds torvalds@linux-foundation.org f266889517252bc697e7103bcd6ed46bdf2c1579 Michael Abbott michael@araneidae.co.uk http://github.com/github/linux-2.6/commit/905ffdc35e50844ab45bbc59d5302238844f8526 905ffdc35e50844ab45bbc59d5302238844f8526 2009-09-22T07:17:49-07:00 2009-09-21T17:04:47-07:00 drivers/hwmon/adm1021.c: add low_power support for adm1021 driver Occasionally it is helpful to be able to turn a temperature sensor off (for example if it's making unwanted electrical noise). This patch adds a sysfs node to put any adm1021 compatible device into low power mode. Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk> Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 13f5fcb88fe9b8f049181234749ea715b509e34b Linus Torvalds torvalds@linux-foundation.org dc791f8aeeeea4314beede83d6ee74e6af5f627b Michael Abbott michael@araneidae.co.uk http://github.com/github/linux-2.6/commit/f266889517252bc697e7103bcd6ed46bdf2c1579 f266889517252bc697e7103bcd6ed46bdf2c1579 2009-09-22T07:17:49-07:00 2009-09-21T17:04:46-07:00 drivers/hwmon/adm1021.c: support high precision ADM1023 remote sensor The ADM1023 temperature sensor supports higher resolution for its external sensor (sensitivity of 1/8 deg C). This patch makes this higher resolution available through the appropriate temperature sysfs nodes. Curiously, this functionality was available in the 2.4 kernel driver (but formatted in a less helpful manner). Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 008a9f272f14e1f3b8e6009dc2509d274cf3155a Linus Torvalds torvalds@linux-foundation.org 2cd9645e2f0d60ed12268fe1738e79c119e2fe5a Daniel Mack daniel@caiaq.de http://github.com/github/linux-2.6/commit/dc791f8aeeeea4314beede83d6ee74e6af5f627b dc791f8aeeeea4314beede83d6ee74e6af5f627b 2009-09-22T07:17:49-07:00 2009-09-21T17:04:45-07:00 lis3_spi: code cleanups Signed-off-by: Daniel Mack <daniel@caiaq.de> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: Eric Piel <eric.piel@tremplin-utc.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 15dff38707ba1991a0e822e43ec15a3923c13fef Linus Torvalds torvalds@linux-foundation.org 8873c33483e62988ed886230aab71ef4c678f710 Daniel Mack daniel@caiaq.de http://github.com/github/linux-2.6/commit/2cd9645e2f0d60ed12268fe1738e79c119e2fe5a 2cd9645e2f0d60ed12268fe1738e79c119e2fe5a 2009-09-22T07:17:49-07:00 2009-09-21T17:04:44-07:00 lis3: add power management functions This enabled power management functions for the SPI transport layer of the lis3 devices. The device's suspend mode is only entered in case no wakeup threshold has been given. In this case, the device is supposed to wake up the system and must thus not be put to deep sleep. [randy.dunlap@oracle.com: fix lis3-spi for CONFIG_PM=n] Signed-off-by: Daniel Mack <daniel@caiaq.de> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: Eric Piel <eric.piel@tremplin-utc.net> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 91e335cd90f62f1de5acbd1c220f80cad50227db Linus Torvalds torvalds@linux-foundation.org 0ec48915e8bbb37dea3df85c41e4c3498b95664b Daniel Mack daniel@caiaq.de http://github.com/github/linux-2.6/commit/8873c33483e62988ed886230aab71ef4c678f710 8873c33483e62988ed886230aab71ef4c678f710 2009-09-22T07:17:48-07:00 2009-09-21T17:04:43-07:00 lis3: add free-fall/wakeup function via platform_data This offers a way for platforms to define flags and thresholds for the free-fall/wakeup functions of the lis302d chips. More registers needed to be seperated as they are specific to the Signed-off-by: Daniel Mack <daniel@caiaq.de> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: Eric Piel <eric.piel@tremplin-utc.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 441cdc48497b84c823330241ecff147642e136a4 Linus Torvalds torvalds@linux-foundation.org 0bf41d9f414a5cf558aff234a0ff486257537574 Daniel Mack daniel@caiaq.de http://github.com/github/linux-2.6/commit/0ec48915e8bbb37dea3df85c41e4c3498b95664b 0ec48915e8bbb37dea3df85c41e4c3498b95664b 2009-09-22T07:17:48-07:00 2009-09-21T17:04:42-07:00 lis3: fix typo Bit 0x80 in CTRL_REG3 is an ACTIVE_LOW rather than an ACTIVE_HIGH function, I got that wrong during my last change. Signed-off-by: Daniel Mack <daniel@caiaq.de> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: Eric Piel <eric.piel@tremplin-utc.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 33818fe22473c3019f10ce1f58f83e003ea4c5af Linus Torvalds torvalds@linux-foundation.org 42e41c54d61e32e8a349943607daa53205324d7f Michael Riepe michael.riepe@googlemail.com http://github.com/github/linux-2.6/commit/0bf41d9f414a5cf558aff234a0ff486257537574 0bf41d9f414a5cf558aff234a0ff486257537574 2009-09-22T07:17:48-07:00 2009-09-21T17:04:41-07:00 drivers/hwmon/coretemp.c: enable the Intel Atom Enable the coretemp driver on an Intel Atom. I'm not sure if the readings are correct, however - on my 330, the driver reports values between 27 and 41 °C (with core1 being about 8°C hotter than core0, given the same load). Maybe the maximum temperature of 100 °C is wrong for Atom CPUs. Cc: Arjan van de Ven <arjan@infradead.org> Cc: Rudolf Marek <r.marek@assembler.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 0ee03f5c5d245f7abedd9be49cef04a9e9d5bd25 Linus Torvalds torvalds@linux-foundation.org 0487683096decad0720dfaf80b9d28173d5f6662 Mike Frysinger vapier@gentoo.org http://github.com/github/linux-2.6/commit/42e41c54d61e32e8a349943607daa53205324d7f 42e41c54d61e32e8a349943607daa53205324d7f 2009-09-22T07:17:48-07:00 2009-09-21T17:04:40-07:00 checkpatch: add some common Blackfin checks Add checks for Blackfin-specific issues that seem to crop up from time to time. In particular, we have helper macros to break a 32bit address into the hi/lo parts, and we want to make sure people use the csync/ssync variant that includes fun anomaly workarounds. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Bryan Wu <cooloney@kernel.org> Cc: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> a38050a0b2e716100372601262273cdbd195baf8 Linus Torvalds torvalds@linux-foundation.org fb9e9096ba94385b738a8ad6c5864b5778285957 Andy Whitcroft apw@canonical.com http://github.com/github/linux-2.6/commit/0487683096decad0720dfaf80b9d28173d5f6662 0487683096decad0720dfaf80b9d28173d5f6662 2009-09-22T07:17:48-07:00 2009-09-21T17:04:39-07:00 checkpatch: version 0.29 Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 506241fcace0596fb4cf1e752d7f8aaa19295c8d Linus Torvalds torvalds@linux-foundation.org ea71a0a019f913bdf506103bd90140d93a2b83f0 Andy Whitcroft apw@canonical.com http://github.com/github/linux-2.6/commit/fb9e9096ba94385b738a8ad6c5864b5778285957 fb9e9096ba94385b738a8ad6c5864b5778285957 2009-09-22T07:17:48-07:00 2009-09-21T17:04:38-07:00 checkpatch: limit sN/uN matches to actual bit sizes Limit our type matcher to the s/u/le/be etc sizes that actually exist to prevent miss categorising s2 as a type. Fix up the spelling of the error also. Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> b066899e4c5a4ca033babb068acdc7d0132186c5 Linus Torvalds torvalds@linux-foundation.org 77f5b10a82bbd832c99ec4b120d5645342a5b140 Andy Whitcroft apw@canonical.com http://github.com/github/linux-2.6/commit/ea71a0a019f913bdf506103bd90140d93a2b83f0 ea71a0a019f913bdf506103bd90140d93a2b83f0 2009-09-22T07:17:48-07:00 2009-09-21T17:04:38-07:00 checkpatch: format strings should not have brackets in macros We should not recommend braces for the following: #define pr_fmt(fmt) "%s: " fmt, __func__ allow things with double quotes round them to avoid this check. Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 0d5cf1171809bf012054c7a028beb93450a664fa Linus Torvalds torvalds@linux-foundation.org 30dad6ebecffebddf6b9947d11e31377fa900ff3 Hannes Eder hannes@hanneseder.net http://github.com/github/linux-2.6/commit/77f5b10a82bbd832c99ec4b120d5645342a5b140 77f5b10a82bbd832c99ec4b120d5645342a5b140 2009-09-22T07:17:48-07:00 2009-09-21T17:04:37-07:00 checkpatch: make -f alias --file, add --help, more verbose help message Impact: - More verbose help/usage message. - Make the option -f an alias for --file. - On -h, --help, and --version display help message and exit(0). - With no FILE(s) given, exit(1) with "no input files". - On invalid options display help/usage and exit(1). Based on a patch by Pavel Machek. Signed-off-by: Hannes Eder <hannes@hanneseder.net> Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 13359c9798da6babc144262b59f777e664ac195e Linus Torvalds torvalds@linux-foundation.org 113f04a836481e9ecc26e8dee8b0e4d52878a288 Andy Whitcroft apw@canonical.com http://github.com/github/linux-2.6/commit/30dad6ebecffebddf6b9947d11e31377fa900ff3 30dad6ebecffebddf6b9947d11e31377fa900ff3 2009-09-22T07:17:48-07:00 2009-09-21T17:04:36-07:00 checkpatch: indent checks -- stop when we run out of continuation lines Ensure we terminate when there are no futher continuation lines when trying to determine relative indent of conditionals and their blocks. Reported-by: John Daiker <daikerjohn@gmail.com> Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 105febf76a8f69f2194383bf027cad7e8d257d1f Linus Torvalds torvalds@linux-foundation.org 463f28648586721c2191130c9b3c27589dcc11a0 Daniel Walker dwalker@fifo99.com http://github.com/github/linux-2.6/commit/113f04a836481e9ecc26e8dee8b0e4d52878a288 113f04a836481e9ecc26e8dee8b0e4d52878a288 2009-09-22T07:17:47-07:00 2009-09-21T17:04:35-07:00 checkpatch: handle C99 comments correctly (performance issue) This fixes the sanitation process in checkpatch.pl so that it blocks out the text after a C99 style comment the same way it does with block style comments. This prevents the text from getting processed as regular code. Signed-off-by: Daniel Walker <dwalker@fifo99.com> Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 3f6261a456fd09d2219bb2fe80d90fd0c093f753 Linus Torvalds torvalds@linux-foundation.org fc0d8d944df0c58cd810f33db82f87dcf5dcc190 Andy Whitcroft apw@canonical.com http://github.com/github/linux-2.6/commit/463f28648586721c2191130c9b3c27589dcc11a0 463f28648586721c2191130c9b3c27589dcc11a0 2009-09-22T07:17:47-07:00 2009-09-21T17:04:34-07:00 checkpatch: possible types -- else cannot start a type An else cannot start a type, it would have to be within a block after the else. This can trigger false modifier matching. Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 6b9ae0d46a17cd4cd904168e5e818ef68b6c7a04 Linus Torvalds torvalds@linux-foundation.org 45b588d6e5cc172704bac0c998ce54873b149b22 David Rientjes rientjes@google.com http://github.com/github/linux-2.6/commit/fc0d8d944df0c58cd810f33db82f87dcf5dcc190 fc0d8d944df0c58cd810f33db82f87dcf5dcc190 2009-09-22T07:17:47-07:00 2009-09-21T17:04:33-07:00 flex_array: add missing kerneldoc annotations Add kerneldoc annotations for function formals of type struct flex_array and gfp_t which are currently lacking. Signed-off-by: David Rientjes <rientjes@google.com> Cc: Dave Hansen <dave@linux.vnet.ibm.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2fb3f712ce4ef5ddd615e145ec1f4afe8f03a689 Linus Torvalds torvalds@linux-foundation.org 4af5a2f770cc8575840ccb1514ec76ecb592985c David Rientjes rientjes@google.com http://github.com/github/linux-2.6/commit/45b588d6e5cc172704bac0c998ce54873b149b22 45b588d6e5cc172704bac0c998ce54873b149b22 2009-09-22T07:17:47-07:00 2009-09-21T17:04:33-07:00 flex_array: introduce DEFINE_FLEX_ARRAY FLEX_ARRAY_INIT(element_size, total_nr_elements) cannot determine if either parameter is valid, so flex arrays which are statically allocated with this interface can easily become corrupted or reference beyond its allocated memory. This removes FLEX_ARRAY_INIT() as a struct flex_array initializer since no initializer may perform the required checking. Instead, the array is now defined with a new interface: DEFINE_FLEX_ARRAY(name, element_size, total_nr_elements) This may be prefixed with `static' for file scope. This interface includes compile-time checking of the parameters to ensure they are valid. Since the validity of both element_size and total_nr_elements depend on FLEX_ARRAY_BASE_SIZE and FLEX_ARRAY_PART_SIZE, the kernel build will fail if either of these predefined values changes such that the array parameters are no longer valid. Since BUILD_BUG_ON() requires compile time constants, several of the static inline functions that were once local to lib/flex_array.c had to be moved to include/linux/flex_array.h. Signed-off-by: David Rientjes <rientjes@google.com> Acked-by: Dave Hansen <dave@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 57a9d3478af60fcf6932c1f61b083b9203ef1ee8 Linus Torvalds torvalds@linux-foundation.org 19da3dd157f8db6fe727ff268dab4791d55a6371 David Rientjes rientjes@google.com http://github.com/github/linux-2.6/commit/4af5a2f770cc8575840ccb1514ec76ecb592985c 4af5a2f770cc8575840ccb1514ec76ecb592985c 2009-09-22T07:17:47-07:00 2009-09-21T17:04:31-07:00 flex_array: add flex_array_shrink function Add a new function to the flex_array API: int flex_array_shrink(struct flex_array *fa) This function will free all unused second-level pages. Since elements are now poisoned if they are not allocated with __GFP_ZERO, it's possible to identify parts that consist solely of unused elements. flex_array_shrink() returns the number of pages freed. Signed-off-by: David Rientjes <rientjes@google.com> Cc: Dave Hansen <dave@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 7af18234d7d171a946925e65e987fd51648be3aa Linus Torvalds torvalds@linux-foundation.org e6de3988aa52debb25a427d085061f3bf1181d54 David Rientjes rientjes@google.com http://github.com/github/linux-2.6/commit/19da3dd157f8db6fe727ff268dab4791d55a6371 19da3dd157f8db6fe727ff268dab4791d55a6371 2009-09-22T07:17:47-07:00 2009-09-21T17:04:31-07:00 flex_array: poison free elements Newly initialized flex_array's and/or flex_array_part's are now poisoned with a new poison value, FLEX_ARRAY_FREE. It's value is similar to POISON_FREE used in the various slab allocators, but is different to distinguish between flex array's poisoned kmem and slab allocator poisoned kmem. This will allow us to identify flex_array_part's that only contain free elements (and free them with an addition to the flex_array API). This could also be extended in the future to identify `get' uses on elements that have not been `put'. If __GFP_ZERO is passed for a part's gfp mask, the poisoning is avoided. These elements are considered to be in-use since they have been initialized. Signed-off-by: David Rientjes <rientjes@google.com> Cc: Dave Hansen <dave@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 4259074638b384e765c73542d74dd8f44750068b Linus Torvalds torvalds@linux-foundation.org 2f30b1f9e1b612cdd1a17daeecf514229e8d6a5f David Rientjes rientjes@google.com http://github.com/github/linux-2.6/commit/e6de3988aa52debb25a427d085061f3bf1181d54 e6de3988aa52debb25a427d085061f3bf1181d54 2009-09-22T07:17:47-07:00 2009-09-21T17:04:30-07:00 flex_array: add flex_array_clear function Add a new function to the flex_array API: int flex_array_clear(struct flex_array *fa, unsigned int element_nr) This function will zero the element at element_nr in the flex_array. Although this is equivalent to using flex_array_put() and passing a pointer to zero'd memory, flex_array_clear() does not require such a pointer to memory that would most likely need to be allocated on the caller's stack which could be significantly large depending on element_size. Signed-off-by: David Rientjes <rientjes@google.com> Cc: Dave Hansen <dave@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 4a5dd6acac3e73049918c646bd977894335e5560 Linus Torvalds torvalds@linux-foundation.org efc03ecb9d674588a13aee27289c2af2afe5e6b4 Marcin Slusarz marcin.slusarz@gmail.com http://github.com/github/linux-2.6/commit/2f30b1f9e1b612cdd1a17daeecf514229e8d6a5f 2f30b1f9e1b612cdd1a17daeecf514229e8d6a5f 2009-09-22T07:17:47-07:00 2009-09-21T17:04:29-07:00 vsprintf: use WARN_ON_ONCE Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 78be4b31e0fee84c34bcd53270257290098ee058 Linus Torvalds torvalds@linux-foundation.org