From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757312AbcBIOKA (ORCPT ); Tue, 9 Feb 2016 09:10:00 -0500 Received: from mail-bl2on0056.outbound.protection.outlook.com ([65.55.169.56]:1377 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754143AbcBIOJ4 (ORCPT ); Tue, 9 Feb 2016 09:09:56 -0500 Authentication-Results: linaro.org; dkim=none (message not signed) header.d=none;linaro.org; dmarc=none action=none header.from=caviumnetworks.com; From: Robert Richter To: Ard Biesheuvel , Will Deacon , Matt Fleming , Catalin Marinas CC: Leif Lindholm , Mark Rutland , Mark Salter , Ganapatrao Kulkarni , , , , Robert Richter Subject: [PATCH v4 2/6] arm64: override generic version of early_init_dt_add_memory_arch() Date: Tue, 9 Feb 2016 14:53:42 +0100 Message-ID: <1455026026-11571-3-git-send-email-rrichter@caviumnetworks.com> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1455026026-11571-1-git-send-email-rrichter@caviumnetworks.com> References: <1455026026-11571-1-git-send-email-rrichter@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [92.224.192.127] X-ClientProxiedBy: AM2PR09CA0006.eurprd09.prod.outlook.com (25.161.22.144) To CY1PR0701MB1614.namprd07.prod.outlook.com (25.163.20.151) X-Microsoft-Exchange-Diagnostics: 1;CY1PR0701MB1614;2:gfkGwB0RS+dXqVRYtRNMlFaX3BNZctcw5baOIYp10JiagcpqlLhAO12ep7g9iZERGUSdnZCLQDs7ug+TglzuwclklK8G1/q242Rln/hQiaRYTM0cGAMUDm/fuHqXExR4wzA5NBiJALnYzKlkCR/dUw==;3:Wo6IkurPGFKy85YzYFbBhCzL1s0a+2OL41xWmZfOlBCJaSuIhJ/dnGOvt6WNsaUrRNqeHyWjdDFuEUEFt6anveXODcalcXxPZQBk+1QAqU/ANhHIiaWzOT6lzvrlyhm5;25:CyQubkGy0potVLJ27gbgJsM0fXjALhQ1oTaioD01xYNULujQU7rtxefExTGzIpWz/RW+MPNhyZQ++/UKozPGt307MBMM0Xu29Si/cI7354f6cO82eIDV71DMZ+DKCdM5zMu81AqYWSdfrQTilfJQdzh43W9W9gETEUUMsYD2hsMX4izNjPJP20P0p24sDZT4w5u412pa78hb8r/kZqmvy27iNUoBENalnPPAkbsDCEbWtxYx7pbTyX10OhF5/D85G7EOU+bqcXC6AIEXYXOizTXJywmGqzvvd0M+byxRh/BR9F+9j7aoa/qBzRDkeX63 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0701MB1614; X-MS-Office365-Filtering-Correlation-Id: 6a476c7b-a4f2-4441-9015-08d331588c40 X-Microsoft-Exchange-Diagnostics: 1;CY1PR0701MB1614;20:hDrx6nwOCvxqrvZQxWL5xxXQlIevvSKNYnOATYJGWalfCnI4ersm075RFX4y9dkcwWjUds6fsrDKp7ztHwXqQUaiJRajBn9PZ2NuGx/ER9MVOT3rgXYcstlkPDYaaX3/psdZk7vDgwbhthrkfgrk5qm/BFGNNQLLAiWxJSgo1RvoVxo7C8Cm0ygAeINHijTdhg4pJKqK3FlWH0fuUsjHtjakuq5B5+sp+WszqUSXnrFIXZjqeQZCecd/JE5dXDIe/hU3BIm5HAPj+KLusHXsFuygtdKc27H+VX1Ma+ZEEEynV+4FXW14B5wybnPdUtv4b8OCSREUNlFrypnZIWX3p/e8TzmNdMnAuKc4vKp/D9S8c7hcR2ssuF9cFqSfkSKRLjtpkp3F2N55i+nH8WY+Q2PLQV5dOYmVVEtgY+t5l0hC7D43oSt5kFOuI3MY/g9LdttDtriEbw+/m/qQ1XkFqbmlQA+S6q7IBcR1txgdaU3ILf7WB8PsbzHd6pf//3T5J8Fg1A9E+iFWeMpGreBkgsFq9gAvtTpgAFzMZC5+3pGEYmNjNp3VZ4JZXYSrom8RNoKKGWqEaQdjQ5bRt/ktXg/yaP6lYHW96fBTnAgL8Ek= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046);SRVR:CY1PR0701MB1614;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0701MB1614; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0701MB1614;4:MyWwIfOMfEsrxipMtjcTPaGIwXxptOq2/YumGYLYB9ZHvazuByXOT5aUUIZnZeXlG39CKJZuEbBkihBcQ9XlvDH5gYUOm73QPJrByTiFhR5cSookIHCSD6qJ6+AR4aOPsk7sHZqSbrIZj+HQe7EIQ2dr3IERNYVJqEeF/kHU4oHPt4f2/n5QIIg7N/zdzdIluzoikXm3ir97hCFjITGzE+KwUcwd8p9oAcTaU51M2MxrPndo203eNbLj8pkEqJysskdQAGwlzabBL/zVCLyq9TTUcZwcaUaIyN5Ohlg+lBg08MoHu+uX+s8AtGtpO161tDg0GnC+e6pT7DZ+8EhNIVJVMfJGHFWR6Oewc9jEaPFHrJjOEKs6Mcy9sLz8FoM7 X-Forefront-PRVS: 08476BC6EF X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(40100003)(229853001)(48376002)(33646002)(5001770100001)(5001960100002)(5003940100001)(36756003)(122386002)(76176999)(50986999)(42186005)(50466002)(92566002)(50226001)(2950100001)(4326007)(2906002)(189998001)(5008740100001)(5004730100002)(19580395003)(77096005)(66066001)(19580405001)(1096002)(47776003)(6116002)(87976001)(586003)(3846002)(41533002);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0701MB1614;H:rric.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0701MB1614;23:R28UpeZuoOhrOt4PeV8qaxA9teCIkpaxeUNfxWCgDnxMJrYSQySe4lMIQuDCvkRC8FXSn/mupc+ZxRCv2uN95QOfPyrVkJvo/5hj/wxOSXw74vBk0/aPwjSNfyI4MOXEzZXmA7Bg4aVhdXLeoLP7tK4ebd/CBn26qSCpvZmOAPHJ8MFpeEPiHFnUoMzkmmqFKEM0gtqbgZQdOILg6G6eT6hjA1MBluoY8SCsK/XN0PBqlNFGDXGhCi0fGqKzhrj0+VAegJxbNSra4BMYEQUDDY/Dk7AUIwRgQmnv5dXSunB32XqnUhD34TEyt8K3MUiuvazbXW8Mzi2Ec7NVg+PHRIVDoxyCghbkoM+UvDTiYKCtJ0TkbVkq3SC2O/rR/j5o1oYt9+ayjlLX4NZP6bRXw3S+zdcyFxtweycQX3xGMC3NUthABdw+IKl6a2yTde3D4QC473nLq8aJKDhlLoQv1IGlSejgDnbEAYVhZghtV8AGvA/cinaFH8mBz3vUnSEKNvinU0PXWmzS0g5E0s51YJYkVkWO79oN9BLj6Hql+e/qv4niJiG989OZkGLFOD5izui1b3drHmLGBBCO+rVPdnwICp8/ePhSGvnMYl2YxMDZ5jWYpHU8H0f+NGf2LKtsqPeI5KCO4yrzaH2P998tgbFpqljXjaZ7Wz5omhKyh1LLTRsyK4yN1tgXVXyKbJLp7Ll7rwcD1Nv92fKmOtNBJ3RSGAHQpbJ7zeHrg2WL7hJA4gQ6PxWQH5zanLsKpBxm/XGfQ7siNXAIE5zZ9+/ZkqA6wbig/FHWRtRYxv87jESRiXVDbZjjDiMV60mHZsToZmDHKHe0CFPGzbDFl97cC3o7kMHLeDVev9fTLHsepWEy/aUvAOCC2mR/dv33PELAc21TcNZ8/WhYrY6oN2D9QkJEotyu0jBgEMOgIu/Mirk= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0701MB1614;5:YCn6A6cplsaL97zF9hDWEcx+slzEGh3oj39EhjDz/Y94IY5CsFXd9MS061qdBcTP3/v4qHmbinterufeZQWQ8B2yaPhbmpxMAyNDieJwupwXuFPLaRFhRLyiwqaxghgVAAvoHZAS17Rs7wdb+GBScA==;24:DH97kpipMeu43M4dR+uddjIuVEjyhCjj5cGY+1jY4R18tVZWM+YXlYjlYdPfzLXqrc8NHgOmaSnC+CP2aEw2b55g8cPZNT4Wk6klFslfuKQ= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2016 13:54:34.4138 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB1614 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel Override the __weak early_init_dt_add_memory_arch() with our own version. We need this in a subsequent patch to make the handling of the memory nodes conditional on whether we are booting via UEFI or not. Note that for now, all that our version does is invoke the generic implementation. Signed-off-by: Ard Biesheuvel Message-Id: <1442881288-13962-3-git-send-email-ard.biesheuvel@linaro.org> Signed-off-by: Robert Richter --- arch/arm64/mm/init.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index f3b061e67bfe..208c1d359018 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -380,3 +380,8 @@ static int __init keepinitrd_setup(char *__unused) __setup("keepinitrd", keepinitrd_setup); #endif + +void __init early_init_dt_add_memory_arch(u64 base, u64 size) +{ + early_init_dt_add_memory(base, size); +} -- 2.7.0.rc3