diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-02 12:45:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-02 12:45:07 -0800 |
| commit | b479667923464591f44531ab3469ae4a0b2e074d (patch) | |
| tree | 4e52bdc8ac508f56747dcf8113ed0e1b66337b46 /fs/gfs2/aops.c | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | s390/pci: obtain function handle in hotplug notifier (diff) | |
| download | linux-dev-b479667923464591f44531ab3469ae4a0b2e074d.tar.xz linux-dev-b479667923464591f44531ab3469ae4a0b2e074d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Two small bug fixes and a follow-up to the CONFIG_NR_CPUS change.
A kernel compiled with CONFIG_NR_CPUS=256 will waste quite a bit of
memory for the per-cpu arrays. Under z/VM the maximum number of CPUs
is 64, the code now limits the possible cpu mask to 64 if running
under z/VM"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/pci: obtain function handle in hotplug notifier
s390/3270: fix allocation of tty3270_screen structure
s390/smp: improve setup of possible cpu mask
Diffstat (limited to 'fs/gfs2/aops.c')
0 files changed, 0 insertions, 0 deletions