Linus Torvalds 547b1e81af Fix staging driver use of VM_RESERVED ...

The VM_RESERVED flag was killed off in commit 314e51b985 ("mm: kill
vma flag VM_RESERVED and mm->reserved_vm counter"), and replaced by the
proper semantic flags (eg "don't core-dump" etc).  But there was a new
use of VM_RESERVED that got missed by the merge.

Fix the remaining use of VM_RESERVED in the vfio_pci driver, replacing
the VM_RESERVED flag with VM_DONTEXPAND | VM_DONTDUMP.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation,org>

2012-10-09 21:06:41 +09:00

..

accessibility

…

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-10-08 07:14:06 +09:00

amba

…

ata

Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2012-10-02 19:01:32 -07:00

atm

sections: fix section conflicts in drivers/atm

2012-10-06 03:04:40 +09:00

auxdisplay

…

base

memory-hotplug: update memory block's state and notify userspace

2012-10-09 16:23:02 +09:00

bcma

…

block

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2012-10-08 06:38:18 +09:00

bluetooth

…

bus

…

cdrom

…

char

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

clk

Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc

2012-10-02 17:26:42 -07:00

clocksource

Merge tag 'pm-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2012-10-02 18:32:35 -07:00

connector

…

cpufreq

Merge tag 'pm-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2012-10-02 18:32:35 -07:00

cpuidle

…

crypto

Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-07 20:55:16 +09:00

dca

…

devfreq

…

dio

…

dma

Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-10-09 07:07:14 +09:00

edac

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2012-10-06 03:16:12 +09:00

eisa

…

extcon

…

firewire

…

firmware

…

gpio

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-10-09 16:08:04 +09:00

gpu

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

hid

…

hsi

…

hv

…

hwmon

Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-07 20:55:16 +09:00

hwspinlock

…

i2c

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-10-08 07:14:06 +09:00

ide

sections: fix section conflicts in drivers/ide

2012-10-06 03:04:41 +09:00

idle

…

iio

…

infiniband

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

input

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-10-08 07:14:06 +09:00

iommu

Merge tag 'iommu-updates-v3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2012-10-08 06:33:44 +09:00

irqchip

…

isdn

Merge tag 'xtensa-next-20121008' of git://github.com/czankel/xtensa-linux

2012-10-09 16:11:46 +09:00

leds

Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2012-10-05 12:01:30 +09:00

lguest

Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-07 21:04:56 +09:00

macintosh

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2012-10-06 03:16:12 +09:00

md

…

media

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

memory

…

memstick

…

message

…

mfd

Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6

2012-10-07 17:29:24 +09:00

misc

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

mmc

sections: fix section conflicts in drivers/mmc

2012-10-06 03:04:42 +09:00

mtd

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

net

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-10-09 16:08:04 +09:00

nfc

…

nubus

…

of

Merge tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux

2012-10-03 09:44:08 -07:00

oprofile

mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file

2012-10-09 16:22:18 +09:00

parisc

…

parport

Merge tag 'xtensa-next-20121008' of git://github.com/czankel/xtensa-linux

2012-10-09 16:11:46 +09:00

pci

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2012-10-06 03:16:12 +09:00

pcmcia

…

pinctrl

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-10-09 16:08:04 +09:00

platform

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-10-08 07:14:06 +09:00

pnp

…

power

Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6

2012-10-07 17:29:24 +09:00

pps

idr: rename MAX_LEVEL to MAX_IDR_LEVEL

2012-10-06 03:04:56 +09:00

ps3

…

ptp

…

pwm

Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2012-10-05 12:01:30 +09:00

rapidio

rapidio: add destination ID allocation mechanism

2012-10-06 03:05:23 +09:00

regulator

Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2012-10-05 12:01:30 +09:00

remoteproc

Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-07 21:04:56 +09:00

rpmsg

Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-07 21:04:56 +09:00

rtc

Merge branch 'akpm' (Andrew's patch-bomb)

2012-10-06 03:09:16 +09:00

s390

Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-07 21:04:56 +09:00

sbus

…

scsi

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

sfi

…

sh

…

sn

…

spi

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-10-09 16:08:04 +09:00

ssb

…

staging

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

target

…

tc

…

thermal

idr: rename MAX_LEVEL to MAX_IDR_LEVEL

2012-10-06 03:04:56 +09:00

tty

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2012-10-06 03:16:12 +09:00

uio

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

usb

Merge branch 'akpm' (Andrew's patch-bomb)

2012-10-09 16:23:15 +09:00

uwb

…

vfio

Fix staging driver use of VM_RESERVED

2012-10-09 21:06:41 +09:00

vhost

…

video

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

virt

…

virtio

…

vlynq

…

vme

…

w1

…

watchdog

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

2012-10-07 21:06:10 +09:00

xen

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

zorro

…

Kconfig

…

Makefile

…