2002-11-29 02:07:46

by Thomas Molina

[permalink] [raw]
Subject: [PATCH] apm.c redefines savesegment in 2.5

I get the following when compiling 2.5.50:

arch/i386/kernel/apm.c:336:1: warning: "savesegment" redefined
In file included from include/linux/elf.h:5,
from include/linux/module.h:17,
from arch/i386/kernel/apm.c:205:
include/asm/elf.h:63:1: warning: this is the location of the previous
definition

This patch fixes it:

--- arch/i386/kernel/apm.c.orig 2002-11-20 18:13:04.000000000 -0600
+++ arch/i386/kernel/apm.c 2002-11-20 18:16:16.000000000 -0600
@@ -331,12 +331,6 @@
#define DEFAULT_BOUNCE_INTERVAL (3 * HZ)

/*
- * Save a segment register away
- */
-#define savesegment(seg, where) \
- __asm__ __volatile__("movl %%" #seg ",%0" : "=m" (where))
-
-/*
* Maximum number of events stored
*/
#define APM_MAX_EVENTS 20