From patchwork Wed Jan 13 09:04:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 566869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3776414009B; Wed, 13 Jan 2016 20:04:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1aJHMN-000377-3z; Wed, 13 Jan 2016 09:04:55 +0000 Received: from mail-wm0-f45.google.com ([74.125.82.45]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.76) (envelope-from ) id 1aJHMD-0002yY-Jp for kernel-team@lists.ubuntu.com; Wed, 13 Jan 2016 09:04:45 +0000 Received: by mail-wm0-f45.google.com with SMTP id f206so360506322wmf.0 for ; Wed, 13 Jan 2016 01:04:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MshvUYD92W0NVSZKJ1iX9zIKeWUGU9l2mFhyfNUe95s=; b=e8aE4PU9fHg7ILEZvOWLiXKjX4lPF6D24t1612tL53qdTLSyosv1mgfK2l8KHvktA7 TrUwpcsvaAMtSCQGJvQCD+FRN+PIgyhWvVTgA0+K3ta3DxyS3sUxMsvIdLxbpRPZRzpv 6gFzENQsDIN3pMp4nO/ToulZXnm4O0aqwF+BETC2oT5cTkRGjPKSlmKwjlXbJ9K7AQ+a vNimbbYg928V2tQ0pyuP+Op69YKZUcSvYjc9rAA/7RVBUiMKhSPRgTNTEjn5gXkXqAkV EN5bKce3xIiFP66hgIExdT/V8BZMay78qqk7mQJjEyeLkckEL5e9f1bLS2jtZm7TfHwA 2dZA== X-Gm-Message-State: ALoCoQnnkn+kaaW+xMHDAsQP+eXKAgr9U4jS/ZipS0FDnmuwc+IOOUYmmKLjJR6I+6LRwSwq92mNcp/3RNM0+Kx8GDew6H6GNw== X-Received: by 10.194.24.164 with SMTP id v4mr18317552wjf.138.1452675885278; Wed, 13 Jan 2016 01:04:45 -0800 (PST) Received: from localhost ([149.18.33.207]) by smtp.gmail.com with ESMTPSA id 67sm21332408wmp.20.2016.01.13.01.04.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jan 2016 01:04:44 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [wily/master-next 1/1] UBUNTU: SAUCE: (no-up) add compat_uts_machine= kernel command line override Date: Wed, 13 Jan 2016 09:04:42 +0000 Message-Id: <1452675882-12805-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1452675882-12805-1-git-send-email-apw@canonical.com> References: <1452675882-12805-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com We wish to use the arm64 buildds to build armhf binaries in 32bit chroots. To make this work we need uname to return armv7l machine type. To achieve this add a kernel command line override for the 32bit machine type. Add compat_uts_machine= to allow the LINUX32 personality to return that type for uname. Signed-off-by: Andy Whitcroft --- kernel/sys.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/kernel/sys.c b/kernel/sys.c index 259fda2..a2a48f0 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1099,6 +1099,21 @@ out: DECLARE_RWSEM(uts_sem); #ifdef COMPAT_UTS_MACHINE +static char compat_uts_machine[__OLD_UTS_LEN+1] = COMPAT_UTS_MACHINE; + +static int __init parse_compat_uts_machine(char *arg) +{ + strncpy(compat_uts_machine, arg, __OLD_UTS_LEN); + compat_uts_machine[__OLD_UTS_LEN] = 0; + return 0; +} +early_param("compat_uts_machine", parse_compat_uts_machine); + +#undef COMPAT_UTS_MACHINE +#define COMPAT_UTS_MACHINE compat_uts_machine +#endif + +#ifdef COMPAT_UTS_MACHINE #define override_architecture(name) \ (personality(current->personality) == PER_LINUX32 && \ copy_to_user(name->machine, COMPAT_UTS_MACHINE, \