From patchwork Thu Nov 10 13:09:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeniy Baskov X-Patchwork-Id: 18125 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp144023wru; Thu, 10 Nov 2022 05:21:45 -0800 (PST) X-Google-Smtp-Source: AMsMyM5TrpgT47U959a4b1aA461le/2dpt8fYsnHbyMx5XfexHjo+hTLJf3SfG1YQHv28rAIiGGI X-Received: by 2002:a17:907:724c:b0:7ad:8f76:1fb8 with SMTP id ds12-20020a170907724c00b007ad8f761fb8mr60069135ejc.582.1668086505738; Thu, 10 Nov 2022 05:21:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668086505; cv=none; d=google.com; s=arc-20160816; b=gvT8j1jDsP97964Pkn6tgBzGSKtTXP7e3HTbJizo2W/o/M6sImsUUaDlIiyVWZE89R 0XcHw5919BaF4UiePTyB/LrLTxRDEWxyrP4HCm5xQAtEDTab1Fa8xbdmBY1o6zqPbrc5 coNBl5kgDXvuPrxFBu0bEhOH5wWKy4sThC2t4hFCoE68a0RIujJExCtPODWmCidaBlcH M0dDjHdA58dD+bC1lhpu3kX5KvZRhPapl7iPOgLJ1chisaVyaK5k+90hxaJ0lk29UzlA OUv0j1aX/WXzjgGm4LzRybcset0yrrSxNNv4AsLPob82vBTXG4nCpFH6GV4Pja1oyNsl ddww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=N1WZT1IJDM73ZsyG84S81mPHKV67S3tkyKPRC/z42gw=; b=pf0B4Xvj+WbNWpax73j//C12ahXq6OHBBwWlr4AuYfilvpRmUI2xZ5Uaoot/QQ/nfv RjSaot9FuuQtGLIcuAoZuohakCto54HDXt4bXgpXYb4FD5/CSuNsw1ZRqoysar/WNW/J k2uwHm/F5E7NfRSEqfIBnviBoSUN3kqL2gb7qCFvakkS/VKtqIQzG4+p1BWxBAGWlUhj z5b+g8d9ZjMe1pPFqAp04RKn1KWWC6RPCFj6p7Cen/2kHSsf+2iaA2o5exnJSqOuvglt OYo7f9puCIZZ1z4tMZX73nxKtL+GicQDgwwLYVYSYhOQZ0pRQhvlqSSX3de0g2IoV2Gz iPyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=iiLSxfjX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sb40-20020a1709076da800b0078df185078esi18000978ejc.663.2022.11.10.05.21.06; Thu, 10 Nov 2022 05:21:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=iiLSxfjX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230387AbiKJNJ4 (ORCPT + 99 others); Thu, 10 Nov 2022 08:09:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230258AbiKJNJl (ORCPT ); Thu, 10 Nov 2022 08:09:41 -0500 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14C14D2CC for ; Thu, 10 Nov 2022 05:09:41 -0800 (PST) Received: from localhost.localdomain (unknown [83.149.199.65]) by mail.ispras.ru (Postfix) with ESMTPSA id 426FB40737BD; Thu, 10 Nov 2022 13:09:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 426FB40737BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1668085776; bh=N1WZT1IJDM73ZsyG84S81mPHKV67S3tkyKPRC/z42gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iiLSxfjXO8lmJK0aHfC+1TUkc9KawXGuDJILvzbimNPJr10M6/Ub56ctVwTJ+rVeB urQqsyF7Uk17UufFw4hxrZmx9vmCP27todN0ywfZReWjUQ/MYc+8u9QN3Ksr8O9vic lWLtW8JBp9q0BOVupxMyC0DWrET5WtqDU7xIKrqg= From: Evgeniy Baskov To: Borislav Petkov Cc: Evgeniy Baskov , Dave Hansen , Ingo Molnar , Thomas Gleixner , linux-kernel@vger.kernel.org, x86@kernel.org, Alexey Khoroshilov Subject: [PATCH v8 5/5] x86/boot: Remove no longer needed includes Date: Thu, 10 Nov 2022 16:09:33 +0300 Message-Id: <52749526f69c73902eaf608f4b544b5060e6e6d9.1668082601.git.baskov@ispras.ru> X-Mailer: git-send-email 2.37.4 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749115475633061221?= X-GMAIL-MSGID: =?utf-8?q?1749115475633061221?= x86/incldue/asm/shared/cmdline.h header already provides COMMAND_LINE_SIZE definition. Signed-off-by: Evgeniy Baskov --- arch/x86/boot/compressed/ident_map_64.c | 4 ---- arch/x86/boot/compressed/kaslr.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/arch/x86/boot/compressed/ident_map_64.c b/arch/x86/boot/compressed/ident_map_64.c index d4a314cc50d6..fdfe0e5f5cb0 100644 --- a/arch/x86/boot/compressed/ident_map_64.c +++ b/arch/x86/boot/compressed/ident_map_64.c @@ -33,10 +33,6 @@ #define __PAGE_OFFSET __PAGE_OFFSET_BASE #include "../../mm/ident_map.c" -#define _SETUP -#include /* For COMMAND_LINE_SIZE */ -#undef _SETUP - extern unsigned long get_cmd_line_ptr(void); /* Used by PAGE_KERN* macros: */ diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index e476bcbd9b42..b73a4d45f8d7 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -32,10 +32,6 @@ #include #include -#define _SETUP -#include /* For COMMAND_LINE_SIZE */ -#undef _SETUP - extern unsigned long get_cmd_line_ptr(void); /* Simplified build-specific string for starting entropy. */