lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 10 Mar 2019 17:24:12 +0100 From: Lubomir Rintel <lkundrak@...sk> To: Sebastian Reichel <sre@...nel.org> Cc: Darren Hart <dvhart@...radead.org>, Rob Herring <robh+dt@...nel.org>, Mark Rutland <mark.rutland@....com>, x86@...nel.org, linux-pm@...r.kernel.org, devicetree@...r.kernel.org, linux-kernel@...r.kernel.org, Lubomir Rintel <lkundrak@...sk> Subject: [PATCH 03/10] x86, olpc: Trivial code move in DT fixup This makes the following patch more concise. Signed-off-by: Lubomir Rintel <lkundrak@...sk> --- Changes since v5: - This patch was split off from "x86, olpc: Use a correct version when making up a battery node" arch/x86/platform/olpc/olpc_dt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c index b69c50cb9742..adf98b5623c0 100644 --- a/arch/x86/platform/olpc/olpc_dt.c +++ b/arch/x86/platform/olpc/olpc_dt.c @@ -238,11 +238,6 @@ void __init olpc_dt_fixup(void) pr_info("PROM DT: Old firmware detected, applying fixes\n"); - /* Add olpc,xo1-battery compatible marker to battery node */ - olpc_dt_interpret("\" /battery@0\" find-device"); - olpc_dt_interpret(" \" olpc,xo1-battery\" +compatible"); - olpc_dt_interpret("device-end"); - board_rev = olpc_dt_get_board_revision(); if (!board_rev) return; @@ -268,6 +263,11 @@ void __init olpc_dt_fixup(void) olpc_dt_interpret(" \" olpc,xo1-rtc\" +compatible"); olpc_dt_interpret("device-end"); } + + /* Add olpc,xo1-battery compatible marker to battery node */ + olpc_dt_interpret("\" /battery@0\" find-device"); + olpc_dt_interpret(" \" olpc,xo1-battery\" +compatible"); + olpc_dt_interpret("device-end"); } void __init olpc_dt_build_devicetree(void) -- 2.20.1
Powered by blists - more mailing lists