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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull virtio balloon driver fixes from Rusty Russell:
"Refactoring broke the balloon driver, and fixing kallsyms on ARM broke
some (non-ARM) MMUless setups, so we're making that fix ARM-only for
now.

Unfortunately, the ARM refactoring which broke kallsyms/perf was
CC:stable, so the fix (which broken non-ARM) was also CC:stable, so
now the partial reversion is also CC:stable..."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
scripts/link-vmlinux.sh: only filter kernel symbols for arm
virtio_balloon: update_balloon_size(): update correct field

Linus Torvalds 12 years ago a3981a52 413541dd

+4 -2

2 changed files

expand all

drivers

virtio

virtio_balloon.c

scripts

link-vmlinux.sh

+1 -1

drivers/virtio/virtio_balloon.c

··· 285 285 { 286 286 __le32 actual = cpu_to_le32(vb->num_pages); 287 287 288 - virtio_cwrite(vb->vdev, struct virtio_balloon_config, num_pages, 288 + virtio_cwrite(vb->vdev, struct virtio_balloon_config, actual, 289 289 &actual); 290 290 } 291 291

+3 -1

scripts/link-vmlinux.sh

··· 82 82 kallsymopt="${kallsymopt} --all-symbols" 83 83 fi 84 84 85 - kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET" 85 + if [ -n "${CONFIG_ARM}" ] && [ -n "${CONFIG_PAGE_OFFSET}" ]; then 86 + kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET" 87 + fi 86 88 87 89 local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \ 88 90 ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"

Configure Feed

Configure Feed