From patchwork Sun Jul 13 18:42:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 4541791 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 183519F36A for ; Sun, 13 Jul 2014 18:43:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3995C20172 for ; Sun, 13 Jul 2014 18:43:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 186052013D for ; Sun, 13 Jul 2014 18:43:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751685AbaGMSnn (ORCPT ); Sun, 13 Jul 2014 14:43:43 -0400 Received: from asavdk4.altibox.net ([109.247.116.15]:60670 "EHLO asavdk4.altibox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751527AbaGMSn3 (ORCPT ); Sun, 13 Jul 2014 14:43:29 -0400 Received: from localhost (localhost [127.0.0.1]) by asavdk4.altibox.net (Postfix) with ESMTP id 3984D800A1; Sun, 13 Jul 2014 20:43:27 +0200 (CEST) Received: from asavdk4.altibox.net ([127.0.0.1]) by localhost (asavdk4.lysetele.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id JcU7KVYt2PRw; Sun, 13 Jul 2014 20:43:26 +0200 (CEST) Received: from merkur.lyse.net (unknown [188.228.89.252]) by asavdk4.altibox.net (Postfix) with ESMTP id 880C180091; Sun, 13 Jul 2014 20:43:26 +0200 (CEST) From: Sam Ravnborg To: Michal Marek , linux-kbuild Cc: lkml , Thierry Reding , Stephen Rothwell , David Herrmann , Jiri Kosina , Sam Ravnborg , David Herrmann Subject: [PATCH 6/6] samples: use uapiprogs support for uhid Date: Sun, 13 Jul 2014 20:42:54 +0200 Message-Id: <1405276974-17323-6-git-send-email-sam@ravnborg.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405276974-17323-1-git-send-email-sam@ravnborg.org> References: <20140713183636.GA17241@ravnborg.org> <1405276974-17323-1-git-send-email-sam@ravnborg.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP uhid was not included in the regular builds as it was not wired up in samples/Makefile. Fix build on sparc32 by defining __USE_GNU to get visibility to O_CLOEXEC. Signed-off-by: Sam Ravnborg Cc: David Herrmann Cc: Jiri Kosina --- samples/Makefile | 1 + samples/uhid/Makefile | 11 +---------- samples/uhid/uhid-example.c | 5 ++++- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/samples/Makefile b/samples/Makefile index 8fc6c45..29a09bd 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -13,3 +13,4 @@ obj-$(CONFIG_SAMPLES) += kdb/ # user space programs subdir-$(CONFIG_SAMPLES) += seccomp subdir-$(CONFIG_SAMPLES) += hidraw +subdir-$(CONFIG_SAMPLES) += uhid diff --git a/samples/uhid/Makefile b/samples/uhid/Makefile index c95a696..75ff2bb 100644 --- a/samples/uhid/Makefile +++ b/samples/uhid/Makefile @@ -1,10 +1 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - -# List of programs to build -hostprogs-y := uhid-example - -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -HOSTCFLAGS_uhid-example.o += -I$(objtree)/usr/include +uapiprogs-y := uhid-example diff --git a/samples/uhid/uhid-example.c b/samples/uhid/uhid-example.c index f25a5ef..e4379c8 100644 --- a/samples/uhid/uhid-example.c +++ b/samples/uhid/uhid-example.c @@ -37,7 +37,6 @@ */ #include -#include #include #include #include @@ -45,6 +44,10 @@ #include #include #include + +#define __USE_GNU +#include + #include /*