Commit 94fcad69 authored Jun 10, 2016 by Linus Torvalds

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull objtool fix from Ingo Molnar:
 "Addresses a false positive warning in the GPU/DRM code"

[ Technically it's not a "false positive", but it's the virtual GPU
  interface that needs the frame pointer for its own internal purposes ]

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool, drm/vmwgfx: Fix "duplicate frame pointer save" warning

parents 698ea54d 0b0d81e3

drivers/gpu/drm/vmwgfx/vmwgfx_msg.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include <linux/slab.h>
		#include <linux/module.h>
		#include <linux/kernel.h>
		#include <linux/frame.h>
		#include <asm/hypervisor.h>
		#include "drmP.h"
		#include "vmwgfx_msg.h"
		@@ -194,7 +195,7 @@ static int vmw_send_msg(struct rpc_channel channel, const char msg)

		return -EINVAL;
		}

		STACK_FRAME_NON_STANDARD(vmw_send_msg);


		/**
		@@ -304,6 +305,7 @@ static int vmw_recv_msg(struct rpc_channel channel, void *msg,

		return 0;
		}
		STACK_FRAME_NON_STANDARD(vmw_recv_msg);


		/**