[GIT PULL] objtool fix

Ingo Molnar
2016-06-10T12:01:37Z

Linus,

Please pull the latest core-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

# HEAD: 0b0d81e3b7334897da9b2e3ffee860c2046f7bc0 objtool, drm/vmwgfx: Fix "duplicate frame pointer save" warning

Addresses a false positive warning in the GPU/DRM code.

Thanks,

Ingo

------------------>
Josh Poimboeuf (1):
objtool, drm/vmwgfx: Fix "duplicate frame pointer save" warning

drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
index 6de283c8fa3e..f0374f9b56ca 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
@@ -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);

/**