Commit graph

360,964 commits

Author SHA1 Message Date
Andreas Herrmann
e4df1cbcc1 cpufreq / powernow-k8: Remove usage of smp_processor_id() in preemptible code
Commit 6889125b8b
(cpufreq/powernow-k8: workqueue user shouldn't migrate the kworker to another CPU)
causes powernow-k8 to trigger a preempt warning, e.g.:

  BUG: using smp_processor_id() in preemptible [00000000] code: cpufreq/3776
  caller is powernowk8_target+0x20/0x49
  Pid: 3776, comm: cpufreq Not tainted 3.6.0 #9
  Call Trace:
   [<ffffffff8125b447>] debug_smp_processor_id+0xc7/0xe0
   [<ffffffff814877e7>] powernowk8_target+0x20/0x49
   [<ffffffff81482b02>] __cpufreq_driver_target+0x82/0x8a
   [<ffffffff81484fc6>] cpufreq_governor_performance+0x4e/0x54
   [<ffffffff81482c50>] __cpufreq_governor+0x8c/0xc9
   [<ffffffff81482e6f>] __cpufreq_set_policy+0x1a9/0x21e
   [<ffffffff814839af>] store_scaling_governor+0x16f/0x19b
   [<ffffffff81484f16>] ? cpufreq_update_policy+0x124/0x124
   [<ffffffff8162b4a5>] ? _raw_spin_unlock_irqrestore+0x2c/0x49
   [<ffffffff81483640>] store+0x60/0x88
   [<ffffffff811708c0>] sysfs_write_file+0xf4/0x130
   [<ffffffff8111243b>] vfs_write+0xb5/0x151
   [<ffffffff811126e0>] sys_write+0x4a/0x71
   [<ffffffff816319a9>] system_call_fastpath+0x16/0x1b

Fix this by by always using work_on_cpu().

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2012-10-23 00:55:10 +02:00
jhbird.choi@samsung.com
debe081aaa PM / Domains: Fix memory leak on error path in pm_genpd_attach_cpuidle
If pm_genpd_attach_cpudidle failed we leak memory stored in 'cpu_data'.

Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2012-10-23 00:54:38 +02:00
Jesper Juhl
2978af545b ACPI: Fix memory leak in acpi_bind_one()
Memory is allocated with kzalloc() and assigned to
'physical_node'. Then 'physical_node->node_id' is initialized with a
call to 'find_first_zero_bit()', if that results in a value greater
than ACPI_MAX_PHYSICAL_NODE we'll end up jumping to the 'err:' label
and there leave the function and let 'physical_node' go out of scope
and leak the memory we allocated.
This patch fixes the leak by simply freeing the unused/unneeded memory
pointed to by 'physical_node' just before we jump to 'err:'.

[rjw: The problem has been introduced by commit 1033f90 (ACPI: Allow
 ACPI binding with USB-3.0 hub), which is new in 3.7-rc.]

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Reviewed-by: Toshi Kani <toshi.kani@hp.com>
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2012-10-23 00:53:58 +02:00
Greg Kroah-Hartman
41c66e0621 Staging: silicom: fix up compiler warnings in bp_proc.c
This removes the compiler warnings for unused variables and functions in
the bp_proc.c file.

Cc: Chad Williamson <chad@dahc.us>
Cc: Daniel Cotey <puff65537@bansheeslibrary.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:52:46 -07:00
Andy Gross
b9ed9f0ecf staging: drm/omap: Fix include error during make
Fixed include error for drm_mode.h

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:50:08 -07:00
Stefan Hajnoczi
54cd1e42f3 staging: line6: drop unused line6_index and line6_id arrays
The line6 driver does not support 'index' and 'id' module parameters so
there is no need to keep arrays for these values.  Do what other sound
drivers do and use the scalar constants instead of dummy arrays.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:50:08 -07:00
Stefan Hajnoczi
b430b3dbdb staging: line6: drop unused line6_devices[] array
There is no reason to limit the number of line6 devices.  Drop the
static array.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:50:08 -07:00
Constantine Shulyupin
8d64c32b9b staging: ccg: rename ccg init and exit functions to conventional names
Previous names of init and exit functions "init" and "cleanup" are
unconventional and are not friendly for source navigation with tags.
New names "ccg_init" and "ccg_exit" are conveninal and source navigation
friendly.

Signed-off-by: Constantine Shulyupin <const@MakeLinux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:50:07 -07:00
Chad Williamson
6b8c8773dc staging: silicom: fix explicit intialization of procfs_dir in bp_proc.c
Remove explicit intialization of static procfs_dir to NULL, resolving a
checkpatch.pl error.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:47:54 -07:00
Chad Williamson
c460c7d946 staging: silicom: remove unnecessary braces in bp_proc.c
Remove unnecessary braces from single statement blocks in bp_proc.c,
resolving checkpatch.pl warnings.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:47:54 -07:00
Chad Williamson
ed5054b6f3 staging: silicom: remove parentheses from return statements in bg_proc.c
Remove unnecessary parentheses from return statements in bg_proc.c to
resolve checkpatch.pl errors.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:47:53 -07:00
Chad Williamson
1713eaf7fc staging: silicom: fix C99 comments in bp_proc.c
Fix C99 // comments in bp_proc.c to resolve checkpatch.pl errors.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:47:53 -07:00
Chad Williamson
19c1fb1375 staging: silicom: fix whitespace in bp_proc.c
Remove superfluous spaces in bp_proc.c to resolve checkpatch.pl errors.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:47:53 -07:00
Rob Clark
b74af83dd2 drm/omap: fix issue w/ fb attached to multiple CRTCs
When the fb is detached from one CRTC/plane, paddr was set back to
zero.  But really we don't want to do this because the fb could still
be attached to other CRTC/plane(s).  This originally worked like this
to catch cases of freeing a pinned fb (but with the refcnt'ing this
should no longer be needed).  Also, there is checking in the GEM code
for freeing a pinned GEM object, so this extra level of checking is
redundant.

Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:46:37 -07:00
Andy Gross
faaa054036 drm/omap: Fix release of refill engine
During asynchronous refills, we don't wait for the refill to
finish.  However, we cannot release the engine back to the idle
list until it has actually completed the refill operation.  The
engine release will now be done in the IRQ handler, but only
for asynchronous refill operations.

Synchronous refills will continue to release the engine after they
unblock from waiting on the refill.

v2: Fixed review comments on async variable and bool type

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:46:37 -07:00
Andy Gross
fe4fc163df drm/omap: Use writecombine for descriptors
Use writecombine for descriptor and PAT programming memory.

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:46:37 -07:00
Andy Gross
0f562d1646 drm/omap: Remove shadow lut usage
Removing extraneous shadow lut maintenance.  There is no need for
this to be in place until power management is added to the driver,
and this extra copy degrades performance for no gain.

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:46:37 -07:00
Alan Cox
b1a4fddea0 staging: silicom: pointless check removal
bus_info is an array not a pointer. Fix silly if check

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:44:30 -07:00
Alan Cox
720a9bece0 staging: dgrp: fix some warnings
Just squashing these to get them out of the analysis queue.

nd_ps_desc is an array not a pointer so comparing it with NULL is silly (be
nice if gcc shouted about this). And there are some slightly pointless
comparisons too.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:44:30 -07:00
Randy Dunlap
b3ca610a22 staging: ramster: depends on NET
ramster uses network interfaces that are only present when
CONFIG_NET is enabled, so it should depend on NET.

Fixes these build errors:

drivers/built-in.o: In function `sc_kref_release':
tcp.c:(.text+0x24b9af): undefined reference to `sock_release'
drivers/built-in.o: In function `r2net_open_listening_sock':
tcp.c:(.text+0x24ca2b): undefined reference to `sock_create'
tcp.c:(.text+0x24cb91): undefined reference to `sock_release'
drivers/built-in.o: In function `r2net_recv_tcp_msg':
tcp.c:(.text+0x24cdbd): undefined reference to `sock_recvmsg'
drivers/built-in.o: In function `r2net_send_tcp_msg':
tcp.c:(.text+0x24d341): undefined reference to `sock_sendmsg'
drivers/built-in.o: In function `r2net_start_connect':
tcp.c:(.text+0x24d8fa): undefined reference to `sock_create'
drivers/built-in.o: In function `r2net_shutdown_sc':
tcp.c:(.text+0x24e30c): undefined reference to `kernel_sock_shutdown'
drivers/built-in.o: In function `r2net_accept_one':
tcp.c:(.text+0x24f392): undefined reference to `sock_create_lite'
tcp.c:(.text+0x24f3c3): undefined reference to `sock_release'
drivers/built-in.o: In function `r2net_stop_listening':
(.text+0x250f63): undefined reference to `sock_release'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: konrad.wilk@oracle.com
Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:42:38 -07:00
Vincent Penquerc'h
23d84ed9c8 staging: omapdrm: fix allocation size for page addresses array
Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Vincent Penquerc'h <vincent.penquerch@collabora.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:41:09 -07:00
Al Viro
e0fd18ce11 arm64: get rid of fork/vfork/clone wrappers
[fixes from Catalin Marinas folded]

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Tested-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2012-10-22 18:14:17 -04:00
Ryan Mallon
fc4e251499 gpiolib: Refactor gpio_export
The gpio_export function uses nested if statements and the status
variable to handle the failure cases. This makes the function logic
difficult to follow. Refactor the code to abort immediately on failure
using goto. This makes the code slightly longer, but significantly
reduces the nesting and number of split lines and makes the code easier
to read.

Signed-off-by: Ryan Mallon <rmallon@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-10-23 00:13:36 +02:00
Lukas Czerner
5de35e8d5c ext4: Avoid underflow in ext4_trim_fs()
Currently if len argument in ext4_trim_fs() is smaller than one block,
the 'end' variable underflow. Avoid that by returning EINVAL if len is
smaller than file system block.

Also remove useless unlikely().

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
2012-10-22 18:01:19 -04:00
Russell King
b43b1ffa82 Merge tag 'fixes-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes 2012-10-22 22:56:09 +01:00
Russell King
00b7dede8b ARM: drop experimental status for hotplug and Thumb2
Both these features have been around for a long time now, and haven't
had any recent issues brought up.  So lets drop their experimental
status.

In any case, hotplugis  selected by other non-experimental options
which then cause a Kconfig warning.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2012-10-22 22:54:30 +01:00
Greg Kroah-Hartman
69afc09042 First round of new IIO drivers and cleanups for the 3.8 cycle.
Here we have
 
 * New driver ad5449 with the introduction of a new IIO return type
   to simplify power of 2 dividers (extremely common case).
 * Some coccinelle warning fixing patches (dull but worthwhile as
   make for easier automated testing and cut down on false positives).
 * Some trivial bits of formatting cleanup and spelling corrections.
 * Use kcalloc in a few places for semantic reasons.
 * Stop lis3l02dq driver (soon to be dropped I hope) using now non
   existent irq_to_gpio.
 * Some dead code/unused variable removal
 * Convert a few drivers to generic core provided functions instead
   of their own versions.
 
 So all in all a nice new driver and a lot of worthy but dull cleanup.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQIcBAABAgAGBQJQgm++AAoJEFSFNJnE9BaI2IkP/AuM7ITQQ737wUGAi0IHayBa
 JjQniXlEDelifbEDLXA2jq+KIJ2kEA+khHz6uB2944RV+v5VJOAIQd2LyOS0N8DN
 l2Ne6+hPzBCGqQ2iYbfPEKzCw9Y4HYNBisCpcjgoLfhvKXjV4Re8qu89lJs457J1
 YvfbYRxCId8wBML20m7P9eEMS0OsXyq6dfU59KZQBKVfOF8dsGEoyxgHTfjzzj7S
 hJNo/9wQPkXMX3O3Cvs8qUmwRGBrTy7vQ5JDjQRYDbcSFXdo9NZtmCSAk6I5fg3T
 HLOQ9k+07QQ762HDIsgg0JO5VCiOcRobw/ZjPTuatN3jAQavVBChRxcAqMHp/uzo
 LSfOzWWOP7c+00YoRCz1BkaQU0WMD19fg6gp2yDsDjeKz9ADaOWuov2tc7oe7pBf
 PbfcK1hrtbyqIK/4xAHyVus5sTZc2aaRzQY/OMzx99nGc9xf5XCfmpB8jf0LjkO5
 kWXqAgajo8RoKtFmiJ7tAE89jIhjRPYeUZDGZgDOz/V3wfkqUMp94AiMTsVZQWLp
 AZkXD7j/cHIfkaajYfJuGDmxU6tagqqbFq4Cfz6r668j9UQrYvuKrqUS3tgFzKGI
 +exh8W5IhNdDlP9CSjE+QbfZpTqo0EcuN/6ySGhxLwiGe1x3P4LrGG1rDkg/Kt2t
 S1JXQia86vz93S1iK3bQ
 =uRm3
 -----END PGP SIGNATURE-----

Merge tag 'iio-for-3.8a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

First round of new IIO drivers and cleanups for the 3.8 cycle.

Here we have

* New driver ad5449 with the introduction of a new IIO return type
  to simplify power of 2 dividers (extremely common case).
* Some coccinelle warning fixing patches (dull but worthwhile as
  make for easier automated testing and cut down on false positives).
* Some trivial bits of formatting cleanup and spelling corrections.
* Use kcalloc in a few places for semantic reasons.
* Stop lis3l02dq driver (soon to be dropped I hope) using now non
  existent irq_to_gpio.
* Some dead code/unused variable removal
* Convert a few drivers to generic core provided functions instead
  of their own versions.

So all in all a nice new driver and a lot of worthy but dull cleanup.
2012-10-22 14:52:19 -07:00
Sunhee Hwang
9385f21b29 Staging: csr: fix code indent coding style issues in csr_wifi_hip_signals.h
This is a patch that fixes up code indent coding style warnings
in the csr_wifi_hip_signals.h found by checkpatch.pl tool.

Signed-off-by: Sunhee Hwang <sunheehwang821@gmail.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:48:14 -07:00
Jugwan Eom
906836f6e3 Staging: csr: csr_wifi_router_ctrl_sef.c: fix line over 80 characters
This patch fixes line over 80 characters problem found by checkpatch.pl
tool.

Signed-off-by: Jugwan Eom <zugwan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:46:49 -07:00
Jugwan Eom
057ed67170 Staging: csr: csr_wifi_router_ctrl_sef.c: fix tab mess
This patch converts spaces to tabs.

Signed-off-by: Jugwan Eom <zugwan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:46:49 -07:00
Jugwan Eom
86a598cd86 Staging: csr: csr_wifi_router_ctrl_sef.c: fix up brace placement
This patch fixes a brace placement error found by checkpatch.pl tool.

Signed-off-by: Jugwan Eom <zugwan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:46:48 -07:00
Sangho Yi
0288f91dbb staging: csr: csr_wifi_sme_sef.h: fixed indentation warnings
Fixed indentation warnings on comments

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:54 -07:00
Sangho Yi
9bf8ff7f18 staging: csr: csr_wifi_sme_serialize.h: fixed indentation warnings
Fixed indentation warnings from the comments.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:54 -07:00
Sangho Yi
f0dbd1dcb1 staging: csr: csr_wifi_sme_sef.h: Fixed lines over 80 chars per line
Fixed lines over 80 characters per line.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:54 -07:00
Sangho Yi
1ac80e498a staging: csr: csr_wifi_sme_sef.h: Fixed from foo* bar to foo *bar
Fixed coding style errors like foo* bar to foo *bar for the definition
of input and output variables of the function interfaces.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:53 -07:00
Sangho Yi
6b74b192f6 staging: csr: csr_wifi_sme_serialize.h: fixed over 80 char lines
Appropriately modified the lines over 80 characters.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:53 -07:00
Sangho Yi
095cc7143d staging: csr: csr_wifi_sme_serialize.h: Fixed from foo* bar to foo *bar
Fixed the coding style convention warnings for the statements of the
pointer variable declaration.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:53 -07:00
Sangho Yi
9851c29c7f staging: csr: csr_wifi_sme_task.h: fixed indentation coding style
Removed coding style warnings occurred on the comments.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:53 -07:00
Sangho Yi
936a8b4c29 Drivers: Staging: CSR: fixed coding style errors in csr_wifi_router_free_upstream_contents.c
Originally there were a lot of coding style errors so, I cleaned up the
coding style errors including braces and indentations.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:01:42 -07:00
Sunhee Hwang
ae485c27c7 Staging: csr: fix pointer(asterisk) position coding style issue in sme_userspace.h
This is a patch in the sme_userspace.h that fixes up
a pointer(asterisk) position warning found by checkpatch.pl tool

Signed-off-by: Sunhee Hwang <sunheehwang821@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:59:05 -07:00
SeongJae Park
cf174b0ef5 staging: csr: csr_framework_ext_types.h: fix coding style
Fix coding style of csr_framework_ext_types.h
    
Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:58:10 -07:00
Daniel Vetter
397fe15715 drm: extract drm_dp_max_lane_count helper
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-10-22 22:56:43 +02:00
Sangho Yi
3f38ea7de4 Staging: CSR: csr_time.h: Removed unnecessary typedef struct
I removed the unnecessary typedef struct from the csr_time.h.
There is no actual usage of the typedef definition.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:53:53 -07:00
Sangho Yi
7177572556 Staging: CSR: csr_time.h: fixed indentation warnings based on coding style
I fixed the indentation warnings on csr_time.h.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:53:09 -07:00
Greg Kroah-Hartman
0567e1ec43 Staging: csr: data_tx: remove extra space in printk
This saves us 1 byte!

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:48:04 -07:00
Greg Kroah-Hartman
dbff11c9d3 Staging: csr: data_tx: fix up brace placement
This cleans up the brace placement coding issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:48:04 -07:00
Greg Kroah-Hartman
7c5745cc08 Staging: csr: data_tx: clean up tab mess
This patch converts spaces to tabs.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:48:04 -07:00
Homin Lee
60ac2e9f7f Staging: csr: csr_log_configure.h: clean up tab mess
Signed-off-by: Homin Lee <homin.lee@suapapa.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:48:04 -07:00
Wei Yongjun
36dab6e5f0 staging: csr: remove unused including <linux/version.h>
Remove including <linux/version.h> that don't need it.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:48:04 -07:00
Nitin Gupta
c8f2f0db1d staging: zram: Fix handling of incompressible pages
Change 130f315a (staging: zram: remove special handle of uncompressed page)
introduced a bug in the handling of incompressible pages which resulted in
memory allocation failure for such pages.

When a page expands on compression, say from 4K to 4K+30, we were trying to
do zsmalloc(pool, 4K+30). However, the maximum size which zsmalloc can
allocate is PAGE_SIZE (for obvious reasons), so such allocation requests
always return failure (0).

For a page that has compressed size larger than the original size (this may
happen with already compressed or random data), there is no point storing
the compressed version as that would take more space and would also require
time for decompression when needed again. So, the fix is to store any page,
whose compressed size exceeds a threshold (max_zpage_size), as-it-is i.e.
without compression.  Memory required for storing this uncompressed page can
then be requested from zsmalloc which supports PAGE_SIZE sized allocations.

Lastly, the fix checks that we do not attempt to "decompress" the page which
we stored in the uncompressed form -- we just memcpy() out such pages.

Signed-off-by: Nitin Gupta <ngupta@vflare.org>
Reported-by: viechweg@gmail.com
Reported-by: paerley@gmail.com
Reported-by: wu.tommy@gmail.com
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:45:19 -07:00