All of lore.kernel.org
 help / color / mirror / Atom feed
* [Xenomai-core] [patch] fix nmi for gcc-4.1
@ 2006-05-23 19:39 Jan Kiszka
  2006-05-23 20:21 ` Gilles Chanteperdrix
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2006-05-23 19:39 UTC (permalink / raw)
  To: xenomai-core


[-- Attachment #1.1: Type: text/plain, Size: 82 bytes --]

Hi,

this patch fixes a gcc-4.1 error in the nmi watchdog code on i386.

Jan

[-- Attachment #1.2: nmi-wd-align.patch --]
[-- Type: text/plain, Size: 899 bytes --]

Index: ksrc/arch/i386/nmi.c
===================================================================
--- ksrc/arch/i386/nmi.c	(Revision 1135)
+++ ksrc/arch/i386/nmi.c	(Arbeitskopie)
@@ -54,12 +54,15 @@
     (P4_CCCR_OVF_PMI0|P4_CCCR_THRESHOLD(15)|P4_CCCR_COMPLEMENT|         \
      P4_CCCR_COMPARE|P4_CCCR_REQUIRED|P4_CCCR_ESCR_SELECT(4)|P4_CCCR_ENABLE)
 
-typedef struct {
-    /* Xenomai watchdog data. */
-    unsigned armed;
-    unsigned long perfctr_msr;
-    unsigned long long next_linux_check;
-    unsigned int p4_cccr_val;
+typedef union {
+    struct {
+        /* Xenomai watchdog data. */
+        unsigned armed;
+        unsigned long perfctr_msr;
+        unsigned long long next_linux_check;
+        unsigned int p4_cccr_val;
+    };
+    char __pad[SMP_CACHE_BYTES];
 } rthal_nmi_wd_t ____cacheline_aligned;
 
 static rthal_nmi_wd_t rthal_nmi_wds[NR_CPUS];

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 250 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2006-05-23 20:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-23 19:39 [Xenomai-core] [patch] fix nmi for gcc-4.1 Jan Kiszka
2006-05-23 20:21 ` Gilles Chanteperdrix

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.