averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity
361,663 Commits 116 Branches 5,777 Tags
dcb4e2d9bb4e3b6ad05bc513a237a87e46952341
Commit Graph
361663 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanpeng Li dcb4e2d9bb staging: zcache: introduce zero filled pages handler 
Introduce zero-filled pages handler to capture and handle zero pages.

Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:24:35 -07:00
Konrad Rzeszutek Wilk ad3c025b35 zcache/TODO: Update on two items. 
Two of them (zcache DebugFS cleanup) and the module loading
capability are now in linux-next for v3.10.

Also Bob Liu is full-time going to help on knocking these items
off the list.

CC: bob.liu@oracle.com
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:24:35 -07:00
Joe Perches 180071a1c3 staging:vt6655:wroute: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:39 -07:00
Joe Perches f9cf92bfc6 staging:vt6655:wpactl: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:39 -07:00
Joe Perches 3e28383f2d staging:vt6655:wpa2: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:39 -07:00
Joe Perches f0c35239af staging:vt6655:wpa: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:39 -07:00
Joe Perches cb850a64d1 staging:vt6655:wmgr: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:39 -07:00
Joe Perches e2b8c6d3a5 staging:vt6655:wctl: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 3bd1a38ba8 staging:vt6655:wcmd: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches d9d644edc3 staging:vt6655:vntwifi: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 031d3996ec staging:vt6655:upc: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 76dffe6435 staging:vt6655:ttype: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 5fd36ba5f5 staging:vt6655:tkip: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 947f9a0273 staging:vt6655:tether: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 9eb6c75336 staging:vt6655:tcrc: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 0c979148d2 staging:vt6655:srom: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches 547f1cffdc staging:vt6655:rxtx: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches 3bd1996e3a staging:vt6655:rf: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches 7e58568f13 staging:vt6655:rc4: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches 474f0f89ef staging:vt6655:power: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches a51ff9058c staging:vt6655:michael: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches fd0badb8ed staging:vt6655:mib: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches c3504bfd11 staging:vt6655:mac: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches d82adcabc6 staging:vt6655:key: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 6da16f9655 staging:vt6655:iwctl: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 722bf5eef7 staging:vt6655:iowpa: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 281c7462f1 staging:vt6655:ioctl: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 5f256874a5 staging:vt6655:iocmd: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 4b61d809a5 staging:vt6655:hostap: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 22c5291e70 staging:vt6655:dpc: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 915006cddc staging:vt6655:device_main: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 74533af4b6 staging:vt6655:device_cfg: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 4ec4aa4ae0 staging:vt6655:device: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 78a717d827 staging:vt6655:desc: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches b8314cfc88 staging:vt6655:datarate: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 9aa69c9ad0 staging:vt6655:country: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 86fcb55d07 staging:vt6655:channel: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches d4945f09dd staging:vt6655:card: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches e1c7757938 staging:vt6655:bssdb: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches 375293671a staging:vt6655:baseband: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches 659b4d97ff staging:vt6655:aes_ccmp: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches b776000227 staging:vt6655:IEEE11h: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches ab4622cca5 staging:vt6655:80211mgr: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches d74e97699a staging:vt6655:80211hdr: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:33 -07:00
Greg Kroah-Hartman c45bb8cb72 Merge 3.9-rc3 into staging-next 
This resolves the merge error due to removing the ccg staging driver,
and picks up the other staging driver fixes that went into 3.9-rc3.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 09:34:14 -07:00
Linus Torvalds a937536b86 Linux 3.9-rc3 v3.9-rc3 2013-03-17 15:59:32 -07:00
David Rientjes 6c4d3bc99b perf,x86: fix link failure for non-Intel configs 
Commit 1d9d8639c0 ("perf,x86: fix kernel crash with PEBS/BTS after
suspend/resume") introduces a link failure since
perf_restore_debug_store() is only defined for CONFIG_CPU_SUP_INTEL:

	arch/x86/power/built-in.o: In function `restore_processor_state':
	(.text+0x45c): undefined reference to `perf_restore_debug_store'

Fix it by defining the dummy function appropriately.

Signed-off-by: David Rientjes <rientjes@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 2013-03-17 15:59:15 -07:00
Linus Torvalds 2a6e06b2ae perf,x86: fix wrmsr_on_cpu() warning on suspend/resume 
Commit 1d9d8639c0 ("perf,x86: fix kernel crash with PEBS/BTS after
suspend/resume") fixed a crash when doing PEBS performance profiling
after resuming, but in using init_debug_store_on_cpu() to restore the
DS_AREA mtrr it also resulted in a new WARN_ON() triggering.

init_debug_store_on_cpu() uses "wrmsr_on_cpu()", which in turn uses CPU
cross-calls to do the MSR update.  Which is not really valid at the
early resume stage, and the warning is quite reasonable.  Now, it all
happens to _work_, for the simple reason that smp_call_function_single()
ends up just doing the call directly on the CPU when the CPU number
matches, but we really should just do the wrmsr() directly instead.

This duplicates the wrmsr() logic, but hopefully we can just remove the
wrmsr_on_cpu() version eventually.

Reported-and-tested-by: Parag Warudkar <parag.lkml@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 2013-03-17 15:44:43 -07:00
Linus Torvalds 08637024ab Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 
Pull btrfs fixes from Chris Mason:
 "Eric's rcu barrier patch fixes a long standing problem with our
  unmount code hanging on to devices in workqueue helpers.  Liu Bo
  nailed down a difficult assertion for in-memory extent mappings."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix warning of free_extent_map
  Btrfs: fix warning when creating snapshots
  Btrfs: return as soon as possible when edquot happens
  Btrfs: return EIO if we have extent tree corruption
  btrfs: use rcu_barrier() to wait for bdev puts at unmount
  Btrfs: remove btrfs_try_spin_lock
  Btrfs: get better concurrency for snapshot-aware defrag work
 2013-03-17 11:04:14 -07:00
Liu Bo 3b2775942d Btrfs: fix warning of free_extent_map 
Users report that an extent map's list is still linked when it's actually
going to be freed from cache.

The story is that

a) when we're going to drop an extent map and may split this large one into
smaller ems, and if this large one is flagged as EXTENT_FLAG_LOGGING which means
that it's on the list to be logged, then the smaller ems split from it will also
be flagged as EXTENT_FLAG_LOGGING, and this is _not_ expected.

b) we'll keep ems from unlinking the list and freeing when they are flagged with
EXTENT_FLAG_LOGGING, because the log code holds one reference.

The end result is the warning, but the truth is that we set the flag
EXTENT_FLAG_LOGGING only during fsync.

So clear flag EXTENT_FLAG_LOGGING for extent maps split from a large one.

Reported-by: Johannes Hirte <johannes.hirte@fem.tu-ilmenau.de>
Reported-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
 2013-03-15 21:51:49 -04:00