From patchwork Mon Apr 29 05:32:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inki Dae X-Patchwork-Id: 2498611 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id B2F393FD85 for ; Mon, 29 Apr 2013 05:32:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9853DE5D3E for ; Sun, 28 Apr 2013 22:32:23 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by gabe.freedesktop.org (Postfix) with ESMTP id 4BC7CE5F28 for ; Sun, 28 Apr 2013 22:32:04 -0700 (PDT) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MM0001SW4NKBNH0@mailout2.samsung.com> for dri-devel@lists.freedesktop.org; Mon, 29 Apr 2013 14:32:02 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.116]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 6F.9C.19350.2D50E715; Mon, 29 Apr 2013 14:32:02 +0900 (KST) X-AuditID: cbfee691-b7fe56d000004b96-e5-517e05d20709 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id C8.72.01422.2D50E715; Mon, 29 Apr 2013 14:32:02 +0900 (KST) Received: from daeinki-desktop.10.32.193.11 ([10.90.8.53]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MM0004VS4PDV5Y0@mmp1.samsung.com>; Mon, 29 Apr 2013 14:32:02 +0900 (KST) From: Inki Dae To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] module: fix mutiple defined issue Date: Mon, 29 Apr 2013 14:32:01 +0900 Message-id: <1367213521-26795-1-git-send-email-inki.dae@samsung.com> X-Mailer: git-send-email 1.7.5.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsWyRsSkRPcSa12gwfcXEhZXvr5ns2hevJ7N YtL9CSwWmx5fY7W4vGsOmwOrx/65a9g97ncfZ/LYvKTeo2/LKkaPz5vkAlijuGxSUnMyy1KL 9O0SuDLe9vayFjzlqDi8dDJbA+MS9i5GTg4JAROJGXsuMkLYYhIX7q1n62Lk4hASWMooMav1 HTNM0c8PJ9ghEosYJSYdamaGcLqYJK7tPs8KUsUmoCoxccV9oHYODhEBG4kLN+1BwswCORJL vrwE2yAsYCRxZM9OsKEsQOVL9h8Gs3kFXCTaT69nhVimIPHryCoo+zObxK4neRD1AhLfJh9i ARkvISArsekA1G2SEgdX3GCZwCi4gJFhFaNoakFyQXFSepGpXnFibnFpXrpecn7uJkZgeJ7+ 92ziDsb7B6wPMSYDjZvILCWanA8M77ySeENjMyMLUxNTYyNzSzPShJXEedVbrAOFBNITS1Kz U1MLUovii0pzUosPMTJxcEo1MPbsmbBkUdb7FZyiUZLv17BsXfroqMF7z9MX6ouczVnviGvX Fv2MnRhwL+rQ9BshV1Rnn/I/7aTpdNBhinwta+mOrZxbjkpMXi9uonHbS9vkbtSWfQ/OX3xk 0DTzXBDf/3M7z6YxvTsjyLrioqSvicAZG75Zf3bPs3+2Kuv7BIXorM3COWqbFA2UWIozEg21 mIuKEwEwU6sxZQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsVy+t9jAd1LrHWBBhceCFpc+fqezaJ58Xo2 i0n3J7BYbHp8jdXi8q45bA6sHvvnrmH3uN99nMlj85J6j74tqxg9Pm+SC2CNamC0yUhNTEkt UkjNS85PycxLt1XyDo53jjc1MzDUNbS0MFdSyEvMTbVVcvEJ0HXLzAFarqRQlphTChQKSCwu VtK3wzQhNMRN1wKmMULXNyQIrsfIAA0krGHMeNvby1rwlKPi8NLJbA2MS9i7GDk5JARMJH5+ OAFli0lcuLeerYuRi0NIYBGjxKRDzcwQTheTxLXd51lBqtgEVCUmrrgPVMXBISJgI3Hhpj1I mFkgR2LJl5eMILawgJHEkT07mUFsFqDyJfsPg9m8Ai4S7afXs0IsU5D4dWQV6wRG7gWMDKsY RVMLkguKk9JzjfSKE3OLS/PS9ZLzczcxgsP/mfQOxlUNFocYBTgYlXh4AzbXBgqxJpYVV+Ye YpTgYFYS4Z19GyjEm5JYWZValB9fVJqTWnyIMRlo+0RmKdHkfGBs5pXEGxqbmBlZGpkbWhgZ m5MmrCTOe7DVOlBIID2xJDU7NbUgtQhmCxMHp1QD4+JnbuwN1pPW5d26o3a/xttkQ92hszei v85/7Tj5VceUufXO7Ko8cVoVi+4Jdr1T685OtrG58ZjzhPoktllnnh0JC53mffvEza/NTDIH P22327er9xbTpdf7vVcWrq9c+vvWtzSJN17PvaeySF+tUVqR6lSSsXvOnRvSa98Ima5eoZub 95jLxV2JpTgj0VCLuag4EQCjmweuwwIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org This patch fixes mutiple defined issue to MODULE_DEVICE_TABLE The issue could be induced when some framework which includes two more sub drivers, is built as one moudle because those sub drivers could have their own MODULE_DEVICE_TABLE. And 'struct of_device_id' isn't needed to be determined by type argument because the definition of 'of_device_id' should be fixed. So this patch makes 'of_devce_id' definition to be fixed and only its instance name to be defined by type. Signed-off-by: Inki Dae --- include/linux/module.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/linux/module.h b/include/linux/module.h index 46f1ea0..ac5d79f 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -84,7 +84,7 @@ void trim_init_extable(struct module *m); #ifdef MODULE #define MODULE_GENERIC_TABLE(gtype,name) \ -extern const struct gtype##_id __mod_##gtype##_table \ +extern const struct of_device_id __mod_##gtype##_table \ __attribute__ ((unused, alias(__stringify(name)))) #else /* !MODULE */