linux-kernel - [PATCH v2] MIPS: fix duplicate define

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1478724294-15736-1-git-send-email-sudipm.mukherjee@gmail.com>
Date:   Wed,  9 Nov 2016 20:44:54 +0000
From:   Sudip Mukherjee <sudipm.mukherjee@...il.com>
To:     Ralf Baechle <ralf@...ux-mips.org>,
        Paul Burton <paul.burton@...tec.com>
Cc:     linux-kernel@...r.kernel.org, linux-mips@...ux-mips.org,
        james.hogan@...tec.com,
        Sudip Mukherjee <sudipm.mukherjee@...il.com>
Subject: [PATCH v2] MIPS: fix duplicate define

The mips build of ip27_defconfig is failing with the error:
In file included from ../arch/mips/include/asm/mach-ip27/spaces.h:29:0,
		 from ../arch/mips/include/asm/page.h:12,
		 from ../arch/mips/vdso/vdso.h:26,
		 from ../arch/mips/vdso/gettimeofday.c:11:
../arch/mips/include/asm/mach-generic/spaces.h:28:0:
	error: "CAC_BASE" redefined [-Werror]
 #define CAC_BASE  _AC(0x80000000, UL)

In file included from ../arch/mips/include/asm/page.h:12:0,
		 from ../arch/mips/vdso/vdso.h:26,
		 from ../arch/mips/vdso/gettimeofday.c:11:
../arch/mips/include/asm/mach-ip27/spaces.h:22:0:
	note: this is the location of the previous definition
 #define CAC_BASE  0xa800000000000000

Add a condition to check if CAC_BASE is already defined, and define it
only if it is not yet defined.

Fixes: 3ffc17d8768b ("MIPS: Adjust MIPS64 CAC_BASE to reflect Config.K0")
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@...ethink.co.uk>
---

v2: corrected a silly mistake of overlooking #else

Build log is at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/174134289

 arch/mips/include/asm/mach-generic/spaces.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h
index 952b0fd..3d6d3b0 100644
--- a/arch/mips/include/asm/mach-generic/spaces.h
+++ b/arch/mips/include/asm/mach-generic/spaces.h
@@ -22,11 +22,13 @@
 #endif
 
 #ifdef CONFIG_32BIT
+#ifndef CAC_BASE
 #ifdef CONFIG_KVM_GUEST
 #define CAC_BASE		_AC(0x40000000, UL)
 #else
 #define CAC_BASE		_AC(0x80000000, UL)
 #endif
+#endif
 #ifndef IO_BASE
 #define IO_BASE			_AC(0xa0000000, UL)
 #endif
-- 
1.9.1