Commit a3981a52 authored Dec 23, 2013 by Linus Torvalds

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

parents 413541dd 7122c3e9

drivers/virtio/virtio_balloon.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,7 @@ static void update_balloon_size(struct virtio_balloon *vb)
		{
		__le32 actual = cpu_to_le32(vb->num_pages);

		virtio_cwrite(vb->vdev, struct virtio_balloon_config, num_pages,
		virtio_cwrite(vb->vdev, struct virtio_balloon_config, actual,
		&actual);
		}

scripts/link-vmlinux.sh

+3 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,9 @@ kallsyms()
		kallsymopt="${kallsymopt} --all-symbols"
		fi

		if [ -n "${CONFIG_ARM}" ] && [ -n "${CONFIG_PAGE_OFFSET}" ]; then
		kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
		fi

		local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \
		${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"