From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 240DAC282DE for ; Thu, 23 May 2019 19:20:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EFAEF217D9 for ; Thu, 23 May 2019 19:20:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639232; bh=2C2QQ3bMoLYNqfonrJ8jPSLJoDzjfVJiXseepizVle8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MMQawFBFXV2w09VcGpnSk8sBkO6ZA6mYaA/JdZEZrH5gXWHba1XZKh5SiSCIKGCQ7 kb/QiqR9J9q132sVssE2mj555cxuuJc766d+YKzTxe+euk6f6tT9xvrPAwarG+jFat 79sk0QbfNaLnOzz+ujGH19Bl8fO0nDPzR8h2KPG8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389645AbfEWTUa (ORCPT ); Thu, 23 May 2019 15:20:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:57284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390050AbfEWTU3 (ORCPT ); Thu, 23 May 2019 15:20:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A589921872; Thu, 23 May 2019 19:20:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639229; bh=2C2QQ3bMoLYNqfonrJ8jPSLJoDzjfVJiXseepizVle8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yf2Q/hGjTbuTHy1FXYEIPqjIsAIxV8MQZpygqNztKTr+E4wVtMtcc4+MV9UddzF/R hqz6LHv2sfW9kA7SsT1UOmPO2BYnqJgBy48kMrhokjJdq3PZSVwzcg/EImGE2m5DUY OXHBXvsLn2VWQKLg7Bu6KgjtUva/cD0lCsCVqQXk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kbuild test robot , Helge Deller Subject: [PATCH 5.0 027/139] parisc: Use PA_ASM_LEVEL in boot code Date: Thu, 23 May 2019 21:05:15 +0200 Message-Id: <20190523181724.229024933@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181720.120897565@linuxfoundation.org> References: <20190523181720.120897565@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Helge Deller commit bdca5d64ee92abeacd6dada0bc6f6f8e6350dd67 upstream. The LEVEL define clashed with the DRBD code. Reported-by: kbuild test robot Signed-off-by: Helge Deller Cc: # v4.14+ Signed-off-by: Greg Kroah-Hartman --- arch/parisc/boot/compressed/head.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/arch/parisc/boot/compressed/head.S +++ b/arch/parisc/boot/compressed/head.S @@ -22,7 +22,7 @@ __HEAD ENTRY(startup) - .level LEVEL + .level PA_ASM_LEVEL #define PSW_W_SM 0x200 #define PSW_W_BIT 36 @@ -63,7 +63,7 @@ $bss_loop: load32 BOOTADDR(decompress_kernel),%r3 #ifdef CONFIG_64BIT - .level LEVEL + .level PA_ASM_LEVEL ssm PSW_W_SM, %r0 /* set W-bit */ depdi 0, 31, 32, %r3 #endif @@ -72,7 +72,7 @@ $bss_loop: startup_continue: #ifdef CONFIG_64BIT - .level LEVEL + .level PA_ASM_LEVEL rsm PSW_W_SM, %r0 /* clear W-bit */ #endif