Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/x86/x86 Rework prior two patches to fix clang relea...
details: https://anonhg.NetBSD.org/src/rev/77fabfe470e4
branches: trunk
changeset: 358942:77fabfe470e4
user: roy <roy%NetBSD.org@localhost>
date: Tue Jan 23 13:57:57 2018 +0000
description:
Rework prior two patches to fix clang release builds.
Original patch by darcy@
diffstat:
sys/arch/x86/x86/intr.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diffs (42 lines):
diff -r 4333e4f2fa0e -r 77fabfe470e4 sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c Tue Jan 23 10:55:38 2018 +0000
+++ b/sys/arch/x86/x86/intr.c Tue Jan 23 13:57:57 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.121 2018/01/16 16:24:23 kre Exp $ */
+/* $NetBSD: intr.c,v 1.122 2018/01/23 13:57:57 roy Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.121 2018/01/16 16:24:23 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.122 2018/01/23 13:57:57 roy Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -243,12 +243,11 @@
#if defined(XEN) /* XXX: nuke conditional after integration */
static const char *xen_intr_string(int, char *, size_t, struct pic *);
#endif /* XXX: XEN */
+#endif
+#if defined(INTRSTACKSIZE)
static inline bool redzone_const_or_false(bool);
static inline int redzone_const_or_zero(int);
-#else
-#define redzone_const_or_false(x) (/*CONSTCOND*/0)
-#define redzone_const_or_zero(x) (0)
#endif
static void intr_redistribute_xc_t(void *, void *);
@@ -1431,7 +1430,7 @@
static const char *x86_ipi_names[X86_NIPI] = X86_IPI_NAMES;
#endif
-#if !defined(XEN)
+#if defined(INTRSTACKSIZE)
static inline bool
redzone_const_or_false(bool x)
{
Home |
Main Index |
Thread Index |
Old Index