aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-10-02kbuild: Do not reference *-n variables in the MakefileMichal Marek1-3/+1
Kconfig options are either 'y', 'm', or undefined. Signed-off-by: Michal Marek <[email protected]>
2014-10-02kbuild: simplify build, clean, modbuiltin shorthandsMasahiro Yamada3-4/+4
$(if $(KBUILD_SRC),$(srctree)/) was a useful strategy to omit a long absolute path for in-source-tree build prior to commit 890676c65d699db3ad82e7dddd0cf8fb449031af (kbuild: Use relative path when building in the source tree). Now $(srctree) is "." when building in the source tree. It would not be annoying to add "$(srctree)/" all the time. Signed-off-by: Masahiro Yamada <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-10-02kbuild: arm: Do not define "comma" twiceMasahiro Yamada2-4/+0
The definition of "comma" exists in scripts/Kbuild.include. We should not double it. Signed-off-by: Masahiro Yamada <[email protected]> Cc: [email protected] Signed-off-by: Michal Marek <[email protected]>
2014-10-02kbuild: remove obj-n and lib-n handlingMasahiro Yamada4-7/+5
Kconfig never defines CONFIG_* as 'n'. Now obj-n is only used in firmware/Makefile and it can be replaced with obj-. No makefile uses lib-n. Let's rip off obj-n and lib-n. Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-10-02kbuild: remove unnecessary variable initializaionsMasahiro Yamada18-69/+0
Clearing obj-y, obj-m, obj-n, obj- in each Makefile is a useless habit. They are non-exported variables; therefore they are always empty whenever descending into each subdirectory. (Moreorver, obj-y and obj-m are also set to empty at the beginning of scripts/Makefile.build) Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Nicolas Ferre <[email protected]> Acked-by: Peter Foley <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-10-02kbuild: remove unnecessary "obj- := dummy.o" trickMasahiro Yamada3-7/+0
In these Makefiles, at least one of "obj-y" and "obj-" is non-empty, hence built-in.o is always created without such a trick. Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Peter Foley <[email protected]> Acked-by: Mike Turquette <[email protected]> Acked-by: Simon Horman <[email protected]> [shmobile] Acked-by: David S. Miller <[email protected]> [networking] Signed-off-by: Michal Marek <[email protected]>
2014-10-01kbuild: handle C=... and M=... after entering into build directoryMasahiro Yamada1-31/+29
This commit avoids processing C=... and M=... twice when O=... is also given. Besides, we can also remove KBUILD_EXTMOD="$(KBUILD_EXTMOD)" in the sub-make target. Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-10-01kbuild: use $(Q) for sub-make targetMasahiro Yamada1-2/+1
Since commit 066b7ed9558087a7957a1128f27d7a3462ff117f (kbuild: Do not print the build directory with make -s), "Q" is defined above the sub-make target. This commit takes advantage of that and replaces "$(if $(KBUILD_VERBOSE:1=),@)" with "$(Q)". Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-10-01kbuild: fake the "Entering directory ..." message more simplyMasahiro Yamada1-11/+8
Commit c2e28dc975ea87feed84415006ae143424912ac7 (kbuild: Print the name of the build directory) added a gimmick to show the "Entering directory ...". Instead of echoing the hard-coded message (that is, we need to know the exact message), moving --no-print-directory would be easier. Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-09-23kconfig/lxdialog: get ncurses CFLAGS with pkg-configBjørn Forsman1-1/+5
This makes "make menuconfig" also work on systems where ncurses is not installed in a standard location (such as on NixOS). This patch changes ccflags() so that it tries pkg-config first, and only if pkg-config fails does it go back to the fallback/manual checks. This is the same algorithm that ldflags() already uses. Signed-off-by: Bjørn Forsman <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-08-22kconfig: nconfig: fix multi-byte UTF handlingBrian Norris1-1/+2
Currently, Kconfig descriptions that use multi-byte UTF-8 characters (such as MTD_NAND_CAFE) will have their menu entries dropped from the 'make nconfig' ncurses menu, and all subsequent entries in the same window will be omitted. This seems to be due to the ncurses 'menu' library, which does not traditionally handle UTF-8 >8-bit characters properly. The ncursesw library ('w' is for "wide") is written to handle these UTF-8 characters, and is practically a drop-in replacement at the source level. Use it by default, if available. Link: https://bugzilla.kernel.org/show_bug.cgi?id=43067 Signed-off-by: Brian Norris <[email protected]> Cc: "Yann E. MORIN" <[email protected]> Cc: Martin Walch <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-08-22kconfig: lxdialog: fix spellingBrian Norris1-1/+1
Signed-off-by: Brian Norris <[email protected]> Cc: "Yann E. MORIN" <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-08-20kbuild: Make scripts executableMichal Marek23-0/+0
The Makefiles call the respective interpreter explicitly, but this makes it easier to use the scripts manually. Signed-off-by: Michal Marek <[email protected]>
2014-08-19kbuild: remove redundant clean-files from scripts/kconfig/MakefileMasahiro Yamada1-1/+0
Now mconf, qconf, gconf, nconf are always added to hostprogs-y. Files added to hostprogs-y are removed by "make clean". Signed-off-by: Masahiro Yamada <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-08-19kbuild: refactor script/kconfig/MakefileMasahiro Yamada1-31/+3
Now it is harmless to add all host programs to hostprogs-y. Signed-off-by: Masahiro Yamada <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-08-19kbuild: handle the dependency of multi-objs hostprogs appropriatelyMasahiro Yamada1-2/+4
Assume we have a Makefile like: hostprogs-y := foo bar foo-objs := foo1.o foo2.o bar-objs := bar1.o bar2.o Without this commit, the host program foo depends on all of foo1.o foo2.o bar1.o bar2.o. This commit allows to handle the dependency of each host program separately. Signed-off-by: Masahiro Yamada <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-08-19kbuild: handle multi-objs dependency appropriatelyMasahiro Yamada2-6/+13
The comment in scripts/Makefile.build says as follows: We would rather have a list of rules like foo.o: $(foo-objs) but that's not so easy, so we rather make all composite objects depend on the set of all their parts This commit makes it possible! For example, assume a Makefile like this obj-m = foo.o bar.o foo-objs := foo1.o foo2.o bar-objs := bar1.o bar2.o Without this patch, foo.o depends on all of foo1.o foo2.o bar1.o bar2.o. It looks funny that foo.o is regenerated when bar1.c is updated. Now we can handle the dependency of foo.o and bar.o separately. Signed-off-by: Masahiro Yamada <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2014-08-16Linux 3.17-rc1Linus Torvalds1-2/+2
2014-08-16Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86Linus Torvalds24-108/+608
Pull x86 platform driver updates from Matthew Garrett: "A moderate number of changes, but nothing awfully significant. A lot of const cleanups, some reworking and additions to the rfkill quirks in the asus driver, a new driver for generating falling laptop events on Toshibas and some misc fixes. Maybe vendors have stopped inventing things" * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (41 commits) platform/x86: Enable build support for toshiba_haps Documentation: Add file about toshiba_haps module platform/x86: Toshiba HDD Active Protection Sensor asus-nb-wmi: Add wapf4 quirk for the U32U alienware-wmi: make hdmi_mux enabled on case-by-case basis ideapad-laptop: Constify DMI table and other r/o variables asus-nb-wmi.c: Rename x401u quirk to wapf4 compal-laptop: correct invalid hwmon name toshiba_acpi: Add Qosmio X75-A to the alt keymap dmi list toshiba_acpi: Add extra check to backlight code Fix log message about future removal of interface ideapad-laptop: Disable touchpad interface on Yoga models asus-nb-wmi: Add wapf4 quirk for the X550CC intel_ips: Make ips_mcp_limits variables static thinkpad_acpi: Mark volume_alsa_control_{vol,mute} as __initdata fujitsu-laptop: Mark fujitsu_dmi_table[] DMI table as __initconst hp-wmi: Add missing __init annotations to initialization code hp_accel: Constify ACPI and DMI tables fujitsu-tablet: Mark DMI callbacks as __init code dell-laptop: Mark dell_quirks[] DMI table as __initconst ...
2014-08-16Merge branch 'release' of ↵Linus Torvalds3-41/+119
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux Pull idle update from Len Brown: "Two Intel-platform-specific updates to intel_idle, and a cosmetic tweak to the turbostat utility" * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: tools/power turbostat: tweak whitespace in output format intel_idle: Broadwell support intel_idle: Disable Baytrail Core and Module C6 auto-demotion
2014-08-16Merge tag 'fixes-for-linus' of ↵Linus Torvalds1-0/+5
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux Pull module fix from Rusty Russell: "Nasty potential bug if someone uses a known module param with an invalid value (we don't fail unknown module params any more, just warn)" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: module: Clean up ro/nx after early module load failures
2014-08-16Merge branch 'rng-queue' of ↵Linus Torvalds1-0/+1
git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio Pull virtio-rng update from Amit Shah: "Add derating factor for use by hwrng core Sending directly to you with the commit log changes Ted Ts'o pointed out. Not sure if Rusty's back after his travel, but this already has his s-o-b" * 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio: virtio: rng: add derating factor for use by hwrng core
2014-08-16Merge branch 'for-linus2' of ↵Linus Torvalds17-305/+541
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs updates from Chris Mason: "These are all fixes I'd like to get out to a broader audience. The biggest of the bunch is Mark's quota fix, which is also in the SUSE kernel, and makes our subvolume quotas dramatically more accurate. I've been running xfstests with these against your current git overnight, but I'm queueing up longer tests as well" * 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: disable strict file flushes for renames and truncates Btrfs: fix csum tree corruption, duplicate and outdated checksums Btrfs: Fix memory corruption by ulist_add_merge() on 32bit arch Btrfs: fix compressed write corruption on enospc btrfs: correctly handle return from ulist_add btrfs: qgroup: account shared subtrees during snapshot delete Btrfs: read lock extent buffer while walking backrefs Btrfs: __btrfs_mod_ref should always use no_quota btrfs: adjust statfs calculations according to raid profiles
2014-08-16Merge tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linuxLinus Torvalds2-30/+62
Pull file locking bugfixes from Jeff Layton: "Most of these patches are to fix a long-standing regression that crept in when the BKL was removed from the file-locking code. The code was converted to use a conventional spinlock, but some fl_release_private ops can block and you can end up sleeping inside the lock. There's also a patch to make /proc/locks show delegations as 'DELEG'" * tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux: locks: update Locking documentation to clarify fl_release_private behavior locks: move locks_free_lock calls in do_fcntl_add_lease outside spinlock locks: defer freeing locks in locks_delete_lock until after i_lock has been dropped locks: don't reuse file_lock in __posix_lock_file locks: don't call locks_release_private from locks_copy_lock locks: show delegations as "DELEG" in /proc/locks
2014-08-16Merge git://git.kvack.org/~bcrl/aio-nextLinus Torvalds1-56/+30
Pull aio updates from Ben LaHaise. * git://git.kvack.org/~bcrl/aio-next: aio: use iovec array rather than the single one aio: fix some comments aio: use the macro rather than the inline magic number aio: remove the needless registration of ring file's private_data aio: remove no longer needed preempt_disable() aio: kill the misleading rcu read locks in ioctx_add_table() and kill_ioctx() aio: change exit_aio() to load mm->ioctx_table once and avoid rcu_read_lock()
2014-08-16platform/x86: Enable build support for toshiba_hapsAzael Avalos2-0/+20
Makefile and Kconfig build support patch for the newly introduced kernel module toshiba_haps. Signed-off-by: Azael Avalos <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16Documentation: Add file about toshiba_haps moduleAzael Avalos2-0/+78
This patch provides information about the Toshiba HDD Active Protection Sensor driver module toshiba_haps. Signed-off-by: Azael Avalos <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16platform/x86: Toshiba HDD Active Protection SensorAzael Avalos1-0/+265
This driver adds support for the built-in accelereometer found on recent Toshiba laptops with HID TOS620A. This driver receives ACPI notify events 0x80 when the sensor detects a sudden move or a harsh vibration, as well as an ACPI notify event 0x81 whenever the movement or vibration has been stabilized. Also provides sysfs entries to get/set the desired protection level and reseting the HDD protection interface. Signed-off-by: Azael Avalos <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16asus-nb-wmi: Add wapf4 quirk for the U32UHans de Goede1-0/+14
As reported here: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1173681 the U32U needs wapf=4 too. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16alienware-wmi: make hdmi_mux enabled on case-by-case basisMario Limonciello1-2/+20
Not all HW supporting WMAX method will support the HDMI mux feature. Explicitly quirk the HW that does support it. Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16ideapad-laptop: Constify DMI table and other r/o variablesMathias Krause1-2/+2
Constify the rfkill_blacklist[] DMI table, the ideapad_rfk_data[] table and the ideapad_attribute_group attribute group. There's no need to have them writeable during runtime. Signed-off-by: Mathias Krause <[email protected]> Cc: Ike Panhc <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16asus-nb-wmi.c: Rename x401u quirk to wapf4Hans de Goede1-13/+13
The actual x401u does not use the so named x401u quirk but the x55u quirk. All that the x401u quirk does it setting wapf to 4, so rename it to wapf4 to stop the confusion. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16compal-laptop: correct invalid hwmon nameRoald Frederickx1-1/+1
Change the name of the hwmon interface from "compal-laptop" to "compal". A dash is an invalid character for a hwmon name and caused the call to hwmon_device_register_with_groups() to fail. Signed-off-by: Roald Frederickx <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16toshiba_acpi: Add Qosmio X75-A to the alt keymap dmi listAzael Avalos1-0/+7
The Toshiba Qosmio X75-A series models also come with the new keymap layout. This patch adds this model to the alt_keymap_dmi list, along with an extra key found on these models. Signed-off-by: Azael Avalos <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16toshiba_acpi: Add extra check to backlight codeAzael Avalos1-4/+17
Some Toshiba models (most notably Qosmios) come with an incomplete backlight method where the AML code doesn't check for write or read commands and always returns HCI_SUCCESS and the actual brightness (and in some cases the max brightness), thus allowing the backlight interface to be registered without write support. This patch changes the set_lcd_brightness function, checking the returned values for values greater than zero to avoid registering a broken backlight interface. Signed-off-by: Azael Avalos <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16Fix log message about future removal of interfaceMartin Kepplinger1-3/+3
If this is going away, it won't be in 2012. Signed-off-by: Martin Kepplinger <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16ideapad-laptop: Disable touchpad interface on Yoga modelsHans de Goede1-0/+27
Yoga models don't offer touchpad ctrl through the ideapad interface, causing ideapad_sync_touchpad_state to send wrong touchpad enable/disable events. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16asus-nb-wmi: Add wapf4 quirk for the X550CCHans de Goede1-0/+9
As reported here: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1173681 the X550CC needs wapf=4 too. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16intel_ips: Make ips_mcp_limits variables staticMathias Krause1-3/+3
These variables don't need to be visible outside of this compilation unit, make them static. Signed-off-by: Mathias Krause <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16thinkpad_acpi: Mark volume_alsa_control_{vol,mute} as __initdataMathias Krause1-2/+2
Mark volume_alsa_control_vol and volume_alsa_control_mute as __initdata, as snd_ctl_new1() will copy the relevant parts, so there is no need to keep the master copies around after initialization. Signed-off-by: Mathias Krause <[email protected]> Cc: Henrique de Moraes Holschuh <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16fujitsu-laptop: Mark fujitsu_dmi_table[] DMI table as __initconstMathias Krause1-5/+5
The DMI table is only ever used during initialization. Mark it as __initconst so its memory can be released afterwards -- roughly 1.5 kB. In turn, the callback functions can be marked with __init, too. Signed-off-by: Mathias Krause <[email protected]> Cc: Jonathan Woithe <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16hp-wmi: Add missing __init annotations to initialization codeMathias Krause1-3/+3
These functions are only called from other initialization routines, so can be marked __init, too. Signed-off-by: Mathias Krause <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16hp_accel: Constify ACPI and DMI tablesMathias Krause1-2/+2
Constify the lis3lv02d_device_ids[] ACPI and the lis3lv02d_dmi_ids[] DMI tables. There's no need to have them writeable during runtime. Signed-off-by: Mathias Krause <[email protected]> Cc: Eric Piel <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16fujitsu-tablet: Mark DMI callbacks as __init codeMathias Krause1-3/+3
The DMI table is already marked as __initconst, so can be the callback functions as they're only used in that context. Signed-off-by: Mathias Krause <[email protected]> Cc: Robert Gerlach <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16dell-laptop: Mark dell_quirks[] DMI table as __initconstMathias Krause1-3/+3
The dell_quirks[] DMI table is only ever used during initialization. Mark it as __initconst so its memory can be released afterwards -- roughly 5.7 kB. In turn, the callback function can be marked with __init, too. Also the touchpad_led_init() function can be marked __init as it's only referenced from dell_init() -- an __init function. Signed-off-by: Mathias Krause <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16eeepc-wmi: Constify asus_quirks[] DMI tableMathias Krause1-1/+1
Constify the asus_quirks[] DMI table. There's no need to have it writeable during runtime. Signed-off-by: Mathias Krause <[email protected]> Cc: Corentin Chary <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16acer-wmi: Mark init data and code as suchMathias Krause1-20/+21
Quite a lot of code and data of acer-wmi.c is only ever used during initialization. Mark those accordingly -- and constify, where appropriate -- so the memory can be released afterwards. All in all those changes move ~10 kB of code and data to the .init sections, marking them for release after initialization has finished. Signed-off-by: Mathias Krause <[email protected]> Cc: "Lee, Chun-Yi" <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16asus-nb-wmi: Constify asus_quirks[] DMI tableMathias Krause1-1/+1
Constify the asus_quirks[] DMI table. There's no need to have it writeable during runtime. Signed-off-by: Mathias Krause <[email protected]> Cc: Corentin Chary <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16alienware-wmi: Mark DMI table as __initconstMathias Krause1-2/+2
The DMI table is only ever used during initialization. Mark it as __initconst so its memory can be released appropriately. In turn, the callback function can be marked with __init, too. Signed-off-by: Mathias Krause <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16acer-wmi: Hide acer_{suspend,resume} for !CONFIG_PM_SLEEPMathias Krause1-0/+5
Encapsulate acer_suspend() and acer_resume with #ifdef CONFIG_PM_SLEEP to get rid of the following warnings: ../acer-wmi.c:2046:12: warning: ‘acer_suspend’ defined but not used [-Wunused-function] ../acer-wmi.c:2068:12: warning: ‘acer_resume’ defined but not used [-Wunused-function] Signed-off-by: Mathias Krause <[email protected]> Cc: "Lee, Chun-Yi" <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>