17 Jan, 2012
27 commits
-
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
ARM: OMAP3: fix build on !CONFIG_IOMMU_API -
When suspending, there was a large list of warnings going something like:
Device 'machinecheck1' does not have a release() function, it is broken and must be fixed
This patch turns the static mce_devices into dynamically allocated, and
properly frees them when they are removed from the system. It solves
the warning messages on my laptop here.Reported-by: "Srivatsa S. Bhat"
Reported-by: Linus Torvalds
Tested-by: Djalal Harouni
Cc: Kay Sievers
Cc: Tony Luck
Cc: Borislav Petkov
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Linus Torvalds -
* 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm:
ARM: sa11x0: assabet: fix build warning
ARM: Add arm_memblock_steal() to allocate memory away from the kernel
ARM: 7275/1: LPAE: Check the CPU support for the long descriptor format
ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97
ARM: 7272/1: S3C24XX: Fix build error for missing
ARM: 7271/1: Fix typo in conversion of ARCH_NR_GPIOS to Kconfig -
NFS client bugfixes and cleanups for Linux 3.3 (pull 2)
* tag 'nfs-for-3.3-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
pnfsblock: alloc short extent before submit bio
pnfsblock: remove rpc_call_ops from struct parallel_io
pnfsblock: move find lock page logic out of bl_write_pagelist
pnfsblock: cleanup bl_mark_sectors_init
pnfsblock: limit bio page count
pnfsblock: don't spinlock when freeing block_dev
pnfsblock: clean up _add_entry
pnfsblock: set read/write tk_status to pnfs_error
pnfsblock: acquire im_lock in _preload_range
NFS4: fix compile warnings in nfs4proc.c
nfs: check for integer overflow in decode_devicenotify_args()
NFS: cleanup endian type in decode_ds_addr()
NFS: add an endian notation -
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (sysfs-interface) Update tempX_type attribute to be more generic
hwmon: (adm1031) Fix coding style issues
hwmon: (it87) Add IT8728F support
hwmon: (coretemp) Add missing section annotations
hwmon: (lm90) Add range check to set_update_interval
hwmon: (lm63) Support extended lookup table of LM96163
hwmon: (lm63) Expose automatic fan speed control lookup table
hwmon: (lm63) Fix incorrect comment about I2C address
hwmon: (lm63) LM64 has a dedicated pin for tachometer
hwmon: (lm63) Add sensor type attribute for external sensor on LM96163
hwmon: (lm63) Add support for update_interval sysfs attribute
hwmon: (lm63) Add support for writing the external critical temperature
hwmon: (lm63) Add support for unsigned upper temperature limits
hwmon: (lm63) Add support for LM96163
hwmon: (lm63) Add support for external temperature offset register
hwmon: (lm63) Fix checkpatch errors
hwmon: (max1111) Change sysfs interface to in[0-3]_input in millivolts -
* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / Hibernate: Drop the check of swap space size for compressed image
PM / shmobile: fix A3SP suspend method
PM / Domains: Skip governor functions for CONFIG_PM_RUNTIME unset
PM / Domains: Fix build for CONFIG_PM_SLEEP unset
PM: Make sysrq-o be available for CONFIG_PM unset -
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scripts/coccinelle: improve the coverage of some semantic patches
coccinelle: semantic patches related to devm_ functions (part 2)
coccinelle: semantic patches related to devm_ functions (part 1)
coccinelle.txt: update documentation to include M= option
coccicheck: add M= option to control which dir is processed
ctags: remove struct forward declarations
scripts/tags.sh: Add Page flag function magic -
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
menuconfig: fix a regression when canceling the prompt dialog at exit
kbuild: Fix compiler warning with assertion when calling 'fwrite'
Improve update-po-config output
menuconfig: let make not report error when not save configuration
merge_config.sh: fix bug in final check
merge_config.sh: whitespace cleanup
merge_config.sh: use signal names compatible with dash and bash
kconfig: add merge_config.sh script
kconfig: use xfwrite wrapper function to silence warnings
kconfig: fix set but not used warnings
kconfig: fix warnings by specifing format arguments -
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
Kbuild: Use dtc's -d (dependency) option
dtc: Implement -d option to write out a dependency file
kbuild: Fix comment in Makefile.lib
scripts/genksyms: clean lex/yacc generated files
kbuild: Correctly deal with make options which contain an "s" -
Since a32618d2 (ARM: pgtable: switch to use pgtable-nopud.h), assabet
warns as follows:arch/arm/mach-sa1100/assabet.c: In function 'map_sa1100_gpio_regs':
arch/arm/mach-sa1100/assabet.c:264: warning: passing argument 1 of 'pmd_offset' from incompatible pointer typeFix this by adding the necessary pud_offset() macro.
Signed-off-by: Russell King
-
The temp[1-*]_type attribute reports the temperature sensor type. Sensor type 1
is described as "PII/Celeron Diode", which is quite restrictive; other CPUs
may also have an embedded temperature sensor diode with similar characteristics.
Change description to "CPU embedded diode" to be more generic.Signed-off-by: Guenter Roeck
Signed-off-by: Jean Delvare -
Fix almost all coding style issues except for the multi-line macro errors,
which do not really apply since the macros are not multi-line statements
but declarations.Based on merged patch series from Zac Storer; fixed remaining checkpatch
errors and warnings.Cc: Zac Storer
Signed-off-by: Guenter Roeck
Signed-off-by: Jean Delvare -
Until we get a datasheet for the IT8728F, treat it as fully compatible
with the IT8721F, as it seems to work reasonably well.This closes kernel bug #27262.
Signed-off-by: Jean Delvare
Acked-by: Guenter Roeck -
Many functions in the coretemp driver lack a proper section
annotation. Add them to let the kernel free the memory after
initialization when possible.Signed-off-by: Jean Delvare
Cc: Durgadoss R
Acked-by: Guenter Roeck
Cc: Fenghua Yu -
When writing the update_interval attribute, the parameter value was
not range checked, which could cause an integer overflow and result
in an arbitrary update interval. Fix by limiting the value range to
.Reported-by: Jean Delvare
Signed-off-by: Guenter Roeck
Signed-off-by: Jean Delvare -
The LM96163 has an extended lookup table with 12 entries instead of 8,
add support for that.Signed-off-by: Jean Delvare
Tested-by: Guenter Roeck
Acked-by: Guenter Roeck -
The LM63 and compatible devices have a lookup table to control the fan
speed automatically. Expose it in sysfs. Values are cached for 5
seconds, independently of the other register values to avoid slowing
down "sensors". We might make the table values writable in the future.Signed-off-by: Jean Delvare
Tested-by: Guenter Roeck
Acked-by: Guenter Roeck -
What was true of the LM63 doesn't apply to the LM64.
Signed-off-by: Jean Delvare
Acked-by: Guenter Roeck -
On the LM64, the tachometer function has a dedicated pin and fan speed
monitoring is always enabled.Signed-off-by: Jean Delvare
Acked-by: Guenter Roeck -
On LM96163, the external temperature sensor type is configurable to
either a thermal diode or a 3904 transistor. The chip reports a wrong
temperature if misconfigured. Add writable attribute to support it.Signed-off-by: Guenter Roeck
Signed-off-by: Jean Delvare -
The update interval is configurable on LM63 and compatibles. Add
support for it.Signed-off-by: Guenter Roeck
Signed-off-by: Jean Delvare -
On LM64, the external critical temperature limit is always writable. On LM96163,
it is writable if the chip is configured for it. Add conditional support for
writing the register dependent on chip type and configuration.Signed-off-by: Guenter Roeck
Signed-off-by: Jean Delvare -
LM96163 supports unsigned upper limits for the external temperature sensor.
Add support for it.Signed-off-by: Guenter Roeck
Signed-off-by: Jean Delvare -
LM96163 is an enhanced version of LM63 with improved PWM resolution. Add chip
detection code as well as support for improved PWM resolution if the chip is
configured to use it.Signed-off-by: Guenter Roeck
Tested-by: Thierry Reding
Signed-off-by: Jean Delvare -
LM63 and compatibles support a temperature offset register for the external
temperature sensor. Add support for it.Signed-off-by: Guenter Roeck
Signed-off-by: Jean Delvare -
Signed-off-by: Guenter Roeck
Tested-by: Thierry Reding
Signed-off-by: Jean Delvare -
This patch fixed the inconsistent max1111 sysfs interface as pointed
out by Jean Delvare:It was pointed to me that the max1111 driver doesn't implement the
standard sysfs interface for hwmon drivers (as described in
Documentation/hwmon/sysfs-interface). It exports files adc[0-3]_in,
which
aren't part of the standard interface. Presumably these should be
renamed to in[0-3]_input. Renaming them is probably not sufficient
though, as I see no scaling done in the driver. As the MAX1111 chip has
a documented full scale of 2.048V, I take it that the LSB of the ADC
has a weight of 8 mV. Exporting raw register values to user-space is
not OK.Reported-by: Jean Delvare
Signed-off-by: Eric Miao
Signed-off-by: Jean Delvare
16 Jan, 2012
9 commits
-
This commit fixes a bug, while introducing a new one..
commit 7203ddbd4be9720649e47d756a001e0c7d7f8ae2
Author: Wang YanQing
Date: Thu Jan 12 11:31:32 2012 +0800menuconfig: let make not report error when not save configuration
Pressing ESC should cancel the yes/no dialog and return back to
the main menu, but not exit from menuconfig.Signed-off-by: Li Zefan
Acked-by: Wang YanQing
Signed-off-by: Michal Marek -
omap3isp depends on CONFIG_IOMMU_API, so avoid registering its
device (and defining its configuration structs) on !CONFIG_IOMMU_API.This is generally nice to have, but more importantly, it fixes:
arch/arm/plat-omap/include/plat/iommu.h: In function 'dev_to_omap_iommu':
arch/arm/plat-omap/include/plat/iommu.h:135: error: 'struct
dev_archdata' has no member named 'iommu'
arch/arm/mach-omap2/devices.c: In function 'omap3_init_camera':
arch/arm/mach-omap2/devices.c:222: error: 'struct dev_archdata' has no
member named 'iommu'
make[1]: *** [arch/arm/mach-omap2/devices.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2Which happens because while setting up the omap3isp device we try
to access the (now nonexistent) iommu member of dev_archdata.Compile tested with omap2plus_defconfig on today's:
commit e343a895a9f342f239c5e3c5ffc6c0b1707e6244
Merge: 06792c4 193a667
Author: Linus Torvalds
Date: Tue Jan 10 18:04:27 2012 -0800Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Reported-by: Govindraj Raja
Reported-by: Arik Nemtsov
Signed-off-by: Ohad Ben-Cohen
Cc: Tony Lindgren
Cc: Joerg Roedel
Cc: Laurent Pinchart
Acked-by: Laurent Pinchart
Acked-by: Tony Lindgren
Signed-off-by: Joerg Roedel -
Recent changes to kernel/module.c caused the following compile
error:kernel/module.c: In function ‘show_taint’:
kernel/module.c:1024:2: error: implicit declaration of function ‘module_flags_taint’ [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errorsCorrect this error by moving the definition of module_flags_taint
outside of the #ifdef CONFIG_MODULE_UNLOAD section.Signed-off-by: Kevin Winchester
Signed-off-by: Linus Torvalds -
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
[media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
mb86a20s: Add a few more register settings at the init seq
mb86a20s: Group registers into the same line
[media] [PATCH] don't reset the delivery system on DTV_CLEAR
[media] [BUG] it913x-fe fix typo error making SNR levels unstable
[media] cx23885: Query the CX25840 during enum_input for status
[media] cx25840: Add support for g_input_status
[media] rc-videomate-m1f.c Rename to match remote controler name
[media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
[media] convert drivers/media/* to use module_platform_driver()
[media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
[media] Exynos4 JPEG codec v4l2 driver
[media] doc: v4l: selection: choose pixels as units for selection rectangles
[media] v4l: s5p-tv: mixer: fix setup of VP scaling
[media] v4l: s5p-tv: mixer: add support for selection API
[media] v4l: emulate old crop API using extended crop/compose API
[media] doc: v4l: add documentation for selection API
[media] doc: v4l: add binary images for selection API
[media] v4l: add support for selection api
[media] hd29l2: fix review findings
... -
* 'for-3.3/drivers' of git://git.kernel.dk/linux-block:
mtip32xx: do rebuild monitoring asynchronously
xen-blkfront: Use kcalloc instead of kzalloc to allocate array
mtip32xx: uninitialized variable in mtip_quiesce_io()
mtip32xx: updates based on feedback
xen-blkback: convert hole punching to discard request on loop devices
xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_io
xen/blk[front|back]: Enhance discard support with secure erasing support.
xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard together
mtip32xx: update to new ->make_request() API
mtip32xx: add module.h include to avoid conflict with moduleh tree
mtip32xx: mark a few more items static
mtip32xx: ensure that all local functions are static
mtip32xx: cleanup compat ioctl handling
mtip32xx: fix warnings/errors on 32-bit compiles
block: Add driver for Micron RealSSD pcie flash cards -
* 'for-3.3/core' of git://git.kernel.dk/linux-block: (37 commits)
Revert "block: recursive merge requests"
block: Stop using macro stubs for the bio data integrity calls
blockdev: convert some macros to static inlines
fs: remove unneeded plug in mpage_readpages()
block: Add BLKROTATIONAL ioctl
block: Introduce blk_set_stacking_limits function
block: remove WARN_ON_ONCE() in exit_io_context()
block: an exiting task should be allowed to create io_context
block: ioc_cgroup_changed() needs to be exported
block: recursive merge requests
block, cfq: fix empty queue crash caused by request merge
block, cfq: move icq creation and rq->elv.icq association to block core
block, cfq: restructure io_cq creation path for io_context interface cleanup
block, cfq: move io_cq exit/release to blk-ioc.c
block, cfq: move icq cache management to block core
block, cfq: move io_cq lookup to blk-ioc.c
block, cfq: move cfqd->icq_list to request_queue and add request->elv.icq
block, cfq: reorganize cfq_io_context into generic and cfq specific parts
block: remove elevator_queue->ops
block: reorder elevator switch sequence
...Fix up conflicts in:
- block/blk-cgroup.c
Switch from can_attach_task to can_attach
- block/cfq-iosched.c
conflict with now removed cic index changes (we now use q->id instead) -
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)
perf tools: Fix compile error on x86_64 Ubuntu
perf report: Fix --stdio output alignment when --showcpuutilization used
perf annotate: Get rid of field_sep check
perf annotate: Fix usage string
perf kmem: Fix a memory leak
perf kmem: Add missing closedir() calls
perf top: Add error message for EMFILE
perf test: Change type of '-v' option to INCR
perf script: Add missing closedir() calls
tracing: Fix compile error when static ftrace is enabled
recordmcount: Fix handling of elf64 big-endian objects.
perf tools: Add const.h to MANIFEST to make perf-tar-src-pkg work again
perf tools: Add support for guest/host-only profiling
perf kvm: Do guest-only counting by default
perf top: Don't update total_period on process_sample
perf hists: Stop using 'self' for struct hist_entry
perf hists: Rename total_session to total_period
x86: Add counter when debug stack is used with interrupts enabled
x86: Allow NMIs to hit breakpoints in i386
x86: Keep current stack in NMI breakpoints
... -
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, atomic: atomic64_read() take a const pointer
x86, UV: Update Boot messages for SGI UV2 platform -
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBI: use own macros for the layout volume
UBI: fix nameless volumes handling
UBIFS: fix non-debug configuration build
15 Jan, 2012
4 commits
-
I added it by mistake. It is useless as no real hardware.
It even uses even Cypress FX2, general USB bridge chip, default IDs
that makes driver load all FX2 devices having default ID...Signed-off-by: Antti Palosaari
Signed-off-by: Mauro Carvalho Chehab -
This is a minor nicification: UBI_LAYOUT_VOLUME_TYPE and
UBI_LAYOUT_VOLUME_ALIGN are currently defined but not used -
use them.Signed-off-by: Richard Weinberger
Signed-off-by: Artem Bityutskiy -
Currently it's possible to create a volume without a name. E.g:
ubimkvol -n 32 -s 2MiB -t static /dev/ubi0 -N ""After that vtbl_check() will always fail because it does not permit
empty strings.Cc: stable@kernel.org
Signed-off-by: Richard Weinberger
Signed-off-by: Artem Bityutskiy -
Fix a brown paperbag bug introduced by me in the previous commit. I was
in hurry and forgot about the non-debug case completely.Artem: amend the commit message and tweak the patch to preserve alignment.
This made the patch a bit less readable, though.Signed-off-by: Artem Bityutskiy
