From: Segher Boessenkool <segher@kernel.crashing.org>
To: linux-kernel@vger.kernel.org
Cc: Segher Boessenkool <segher@kernel.crashing.org>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Subject: [PATCH] alpha: Fix percpu for !SMP
Date: Tue, 24 Jun 2008 18:25:12 +0200 [thread overview]
Message-ID: <59ea9d21fca74a2e8ffec8384815d7c54c8b4a5c.1214324538.git.segher@kernel.crashing.org> (raw)
Commit 9267b4b3880d00dc2dab90f1d817c856939114f7 introduced a
percpu.h for alpha. It didn't define PER_CPU_ATTRIBUTES for
the non-SMP case, leading to build failures for such a config
(e.g., the alpha defconfig).
Fix this by defining PER_CPU_ATTRIBUTES to empty at the end of
asm-alpha/percpu.h if it wasn't already defined, just like the
asm-generic version does. The SMP && !MODULE case can drop its
own definition now as well.
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
---
This is needed for 2.6.26, it's a regression fix.
include/asm-alpha/percpu.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/include/asm-alpha/percpu.h b/include/asm-alpha/percpu.h
index 82e8a94..c3e2a1c 100644
--- a/include/asm-alpha/percpu.h
+++ b/include/asm-alpha/percpu.h
@@ -28,7 +28,6 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
#ifndef MODULE
#define SHIFT_PERCPU_PTR(var, offset) RELOC_HIDE(&per_cpu_var(var), (offset))
-#define PER_CPU_ATTRIBUTES
#else
/*
* To calculate addresses of locally defined variables, GCC uses 32-bit
@@ -73,4 +72,8 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu_var(name)
+#ifndef PER_CPU_ATTRIBUTES
+#define PER_CPU_ATTRIBUTES
+#endif
+
#endif /* __ALPHA_PERCPU_H */
--
1.5.5.1.g377d9.dirty
next reply other threads:[~2008-06-24 16:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-24 16:25 Segher Boessenkool [this message]
2008-06-24 19:34 ` Ivan Kokshaysky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=59ea9d21fca74a2e8ffec8384815d7c54c8b4a5c.1214324538.git.segher@kernel.crashing.org \
--to=segher@kernel.crashing.org \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®