From patchwork Tue Jun 13 06:21:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 107101 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp339253vqr; Mon, 12 Jun 2023 23:30:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ72BwOPCu5zuSLuvfSX/+i+sWAd6chkX80dglssU2JzZKcfLGAWALgDNE4PcrypH3CGnxi1 X-Received: by 2002:a17:907:3181:b0:96f:f451:187f with SMTP id xe1-20020a170907318100b0096ff451187fmr10918314ejb.7.1686637851171; Mon, 12 Jun 2023 23:30:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686637851; cv=none; d=google.com; s=arc-20160816; b=pdICKmzocHVpsi0oSu8utA6SK8vp2YcTwAUDBlY4vfuBXaD+v8FRA6wXFfto66cdAa Zx3FZQZIZsWhYXsNRujpqPImEW9veiMcjDTtCzSNQrj4UaBloYeGOLt1YJCVX4ERmeFH 3v6qW9Bt/MmT3DA+N3qO1Uch95SzdbNWXpb5WcDms/7rtpQfU7PMYlrEz2e/i9b3ceew 8xAlpiBekvKq6ZohpwiAIQDamIvr4K2FTSc5eGvBIlcLYiz1U/9IyYKHftpuduJiW6B8 k1q7Dg9C41VqEIapG5oKOpQd8WDt/kck3JvtBviuD72/WqrIYiOVfr9/xwm8+VrVA99s HfcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=09oLrHGEmpgpyTpLPSc4jHEwyd/VNs8IHZbmFF1qxD0=; b=f8WGqHelyIPGbzbNldPNiTAOP3Dtv8zGVz2MKNicREIMFctkQvWTa7JfaqlQGPZEiF gLMvJpA3pwjKtpUovylhTyBQkbqpnhgHwagIMp/ttZRvVftQl/X8y39AvQntGE893drC VV/tvKsHcKwt4azSsyT9SOiwFQ2Bg7ifFLY7erXzZoKDL/qMux6h48vffrqT4LFbImjp gGaFa6beCb61cgl5uH4N/AuuF5MwcZMoxrA4vsEtzDRkNmPR3kymSXIFasIp5+zn/uQr FMLdF8/PP8K01mDGPeQwMeF5lO6IcsLCg3KfYPtH3x6dI2jbO+nnlWr7v65hcmkB7KtY i81A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=p257LeXX; 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=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v28-20020aa7cd5c000000b005145884d235si6932790edw.210.2023.06.12.23.30.17; Mon, 12 Jun 2023 23:30:51 -0700 (PDT) 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=@canb.auug.org.au header.s=201702 header.b=p257LeXX; 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=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239948AbjFMGVe (ORCPT + 99 others); Tue, 13 Jun 2023 02:21:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240278AbjFMGVY (ORCPT ); Tue, 13 Jun 2023 02:21:24 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 985D3E47; Mon, 12 Jun 2023 23:21:22 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QgJNJ3Ywbz4x3y; Tue, 13 Jun 2023 16:21:20 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686637281; bh=09oLrHGEmpgpyTpLPSc4jHEwyd/VNs8IHZbmFF1qxD0=; h=Date:From:To:Cc:Subject:From; b=p257LeXXti8Ytj43puEZXiR0jOqqbg0HzOPzCYhgkkV3Umbssxt9OYv6TIyHfy8sP rlbDjbti7oFaeDP7lv5IZugyvCsDKiwrYRo6CWzoFiM/cJkmyfhUL0efoXJHC53Q+5 WtRuofXTdsvB/FRX8aWjwmKEUx8empsTq6wNg7DoQJ2iqeMoI2vcdiUS5gvDGJnxM7 DdKqGhm//56jaI/4d++oZ0aHn8qJAgO0YWF7IAyM4Ff835NO2FxseN6yiE7Vp5p0HZ AhobZSuNsaYkLYCcPG9cqWFtmzTe658dKg9ncvgD992nkIkg16w2V5BF49DXsqkLGv FyE6vTLL9DLxA== Date: Tue, 13 Jun 2023 16:21:19 +1000 From: Stephen Rothwell To: Andrew Morton Cc: Catalin Marinas , Linux Kernel Mailing List , Linux Next Mailing List , Michael Ellerman , PowerPC Subject: linux-next: build failure after merge of the mm tree Message-ID: <20230613162119.4a7a7d3c@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED 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?1768567971855029821?= X-GMAIL-MSGID: =?utf-8?q?1768567971855029821?= Hi all, After merging the mm tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this: In file included from arch/powerpc/include/asm/page.h:247, from arch/powerpc/include/asm/thread_info.h:13, from include/linux/thread_info.h:60, from include/asm-generic/preempt.h:5, from ./arch/powerpc/include/generated/asm/preempt.h:1, from include/linux/preempt.h:78, from include/linux/spinlock.h:56, from include/linux/ipc.h:5, from include/uapi/linux/sem.h:5, from include/linux/sem.h:5, from include/linux/compat.h:14, from arch/powerpc/kernel/asm-offsets.c:12: arch/powerpc/include/asm/page_32.h:16: warning: "ARCH_DMA_MINALIGN" redefined 16 | #define ARCH_DMA_MINALIGN L1_CACHE_BYTES | In file included from include/linux/time.h:5, from include/linux/compat.h:10: include/linux/cache.h:104: note: this is the location of the previous definition 104 | #define ARCH_DMA_MINALIGN __alignof__(unsigned long long) | (lots of theses) Caused by commit cc7335787e73 ("mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN") I have applied the following hack for today - we need something better. From: Stephen Rothwell Date: Tue, 13 Jun 2023 16:07:16 +1000 Subject: [PATCH] fix up for "mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN" Signed-off-by: Stephen Rothwell --- arch/powerpc/include/asm/cache.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h index ae0a68a838e8..e9be1396dfd1 100644 --- a/arch/powerpc/include/asm/cache.h +++ b/arch/powerpc/include/asm/cache.h @@ -142,5 +142,14 @@ static inline void iccci(void *addr) } #endif /* !__ASSEMBLY__ */ + +#ifndef __powerpc64__ +#ifdef CONFIG_NOT_COHERENT_CACHE +#ifndef ARCH_DMA_MINALIGN +#define ARCH_DMA_MINALIGN L1_CACHE_BYTES +#endif +#endif +#endif + #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_CACHE_H */