From patchwork Wed Mar 16 00:30:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lo=C3=AFc_Minier?= X-Patchwork-Id: 87133 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 6E3D3B70D2 for ; Wed, 16 Mar 2011 11:30:50 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PzedQ-0001S3-L5; Wed, 16 Mar 2011 00:30:44 +0000 Received: from pig2.dooz.org ([88.191.118.219]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PzedP-0001RI-0t for kernel-team@lists.ubuntu.com; Wed, 16 Mar 2011 00:30:43 +0000 Received: from bee.dooz.org (serris.dooz.org [88.166.229.232]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "bee.dooz.org", Issuer "CA Cert Signing Authority" (verified OK)) by pig2.dooz.org (Postfix) with ESMTPS id 745FDC0022; Wed, 16 Mar 2011 00:30:46 +0000 (UTC) Received: by bee.dooz.org (Postfix, from userid 1000) id 70B31137C; Wed, 16 Mar 2011 01:30:34 +0100 (CET) From: =?UTF-8?q?Lo=C3=AFc=20Minier?= To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/6] UBUNTU: Enforce DEFAULT_MMAP_MIN_ADDR on armhf Date: Wed, 16 Mar 2011 01:30:15 +0100 Message-Id: <1300235418-19872-4-git-send-email-loic.minier@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1300235418-19872-1-git-send-email-loic.minier@linaro.org> References: <1300235418-19872-1-git-send-email-loic.minier@linaro.org> MIME-Version: 1.0 Cc: =?UTF-8?q?Lo=C3=AFc=20Minier?= X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Also enforce CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 on armhf. Signed-off-by: Loïc Minier --- debian.master/config/enforce | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.master/config/enforce b/debian.master/config/enforce index bd98fd9..88822e6 100644 --- a/debian.master/config/enforce +++ b/debian.master/config/enforce @@ -21,8 +21,8 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y !exists CONFIG_STRICT_DEVMEM | value CONFIG_STRICT_DEVMEM y # For architectures which support this option ensure it is disabled. !exists CONFIG_COMPAT_VDSO | value CONFIG_COMPAT_VDSO n -# Default to 32768 for armel, 65536 for everything else. -( arch armel & value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768 ) | \ +# Default to 32768 on ARM, 65536 for everything else. +( ( arch armel | arch armhf ) & value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768 ) | \ ( value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536) # CONFIG_USB_DEVICE_FS breaks udev USB firmware loading and is deprecated