[Glibc-bsd-commits] r4116 - in trunk/kfreebsd-kernel-headers/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Feb 25 11:45:47 UTC 2012
Author: rmh
Date: 2012-02-25 11:45:47 +0000 (Sat, 25 Feb 2012)
New Revision: 4116
Added:
trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
Removed:
trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
Include <sys/io.h> in <machine/cpufunc.h> (users expect the definitions we removed).
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2012-02-25 11:43:11 UTC (rev 4115)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2012-02-25 11:45:47 UTC (rev 4116)
@@ -2,8 +2,10 @@
* Actually give preference to local headers in testsuite (use -I
rather than -isystem).
+ * Include <sys/io.h> in <machine/cpufunc.h> (users expect the
+ definitions we removed).
- -- Robert Millan <rmh at debian.org> Sat, 25 Feb 2012 12:43:03 +0100
+ -- Robert Millan <rmh at debian.org> Sat, 25 Feb 2012 12:45:40 +0100
kfreebsd-kernel-headers (0.74) unstable; urgency=low
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2012-02-25 11:43:11 UTC (rev 4115)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2012-02-25 11:45:47 UTC (rev 4116)
@@ -1,274 +0,0 @@
-
-See #660396
-
---- a/sys/amd64/include/cpufunc.h
-+++ b/sys/amd64/include/cpufunc.h
-@@ -41,6 +41,8 @@
-
- #include <sys/types.h>
-
-+#include <stdint.h>
-+
- #ifndef _SYS_CDEFS_H
- #error this file needs sys/cdefs.h as a prerequisite
- #endif
-@@ -173,108 +175,6 @@
- __asm __volatile("hlt");
- }
-
--static __inline u_char
--inb(unsigned int port)
--{
-- unsigned char data;
--
-- __asm __volatile("inb %w1, %0" : "=a" (data) : "Nd" (port));
-- return (data);
--}
--
--static __inline u_int
--inl(unsigned int port)
--{
-- unsigned int data;
--
-- __asm __volatile("inl %w1, %0" : "=a" (data) : "Nd" (port));
-- return (data);
--}
--
--static __inline void
--insb(unsigned int port, void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; insb"
-- : "+D" (addr), "+c" (count)
-- : "d" (port)
-- : "memory");
--}
--
--static __inline void
--insw(unsigned int port, void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; insw"
-- : "+D" (addr), "+c" (count)
-- : "d" (port)
-- : "memory");
--}
--
--static __inline void
--insl(unsigned int port, void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; insl"
-- : "+D" (addr), "+c" (count)
-- : "d" (port)
-- : "memory");
--}
--
--static __inline void
--invd(void)
--{
-- __asm __volatile("invd");
--}
--
--static __inline u_short
--inw(unsigned int port)
--{
-- unsigned short data;
--
-- __asm __volatile("inw %w1, %0" : "=a" (data) : "Nd" (port));
-- return (data);
--}
--
--static __inline void
--outb(unsigned int port, unsigned char data)
--{
-- __asm __volatile("outb %0, %w1" : : "a" (data), "Nd" (port));
--}
--
--static __inline void
--outl(unsigned int port, unsigned int data)
--{
-- __asm __volatile("outl %0, %w1" : : "a" (data), "Nd" (port));
--}
--
--static __inline void
--outsb(unsigned int port, const void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; outsb"
-- : "+S" (addr), "+c" (count)
-- : "d" (port));
--}
--
--static __inline void
--outsw(unsigned int port, const void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; outsw"
-- : "+S" (addr), "+c" (count)
-- : "d" (port));
--}
--
--static __inline void
--outsl(unsigned int port, const void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; outsl"
-- : "+S" (addr), "+c" (count)
-- : "d" (port));
--}
--
--static __inline void
--outw(unsigned int port, unsigned short data)
--{
-- __asm __volatile("outw %0, %w1" : : "a" (data), "Nd" (port));
--}
--
- static __inline void
- mfence(void)
- {
---- a/sys/mips/include/cpufunc.h
-+++ b/sys/mips/include/cpufunc.h
-@@ -60,6 +60,7 @@
- #define _MACHINE_CPUFUNC_H_
-
- #include <sys/types.h>
-+#include <stdint.h>
- #include <machine/cpuregs.h>
-
- /*
---- a/sys/powerpc/include/cpufunc.h
-+++ b/sys/powerpc/include/cpufunc.h
-@@ -29,6 +29,8 @@
- #ifndef _MACHINE_CPUFUNC_H_
- #define _MACHINE_CPUFUNC_H_
-
-+#include <stdint.h>
-+
- /*
- * Required for user-space atomic.h includes
- */
---- a/sys/sparc64/include/cpufunc.h
-+++ b/sys/sparc64/include/cpufunc.h
-@@ -29,6 +29,7 @@
- #ifndef _MACHINE_CPUFUNC_H_
- #define _MACHINE_CPUFUNC_H_
-
-+#include <stdint.h>
- #include <machine/asi.h>
- #include <machine/pstate.h>
-
---- a/sys/i386/include/cpufunc.h
-+++ b/sys/i386/include/cpufunc.h
-@@ -40,6 +40,8 @@
-
- #include <sys/types.h>
-
-+#include <stdint.h>
-+
- #ifndef _SYS_CDEFS_H
- #error this file needs sys/cdefs.h as a prerequisite
- #endif
-@@ -188,108 +190,6 @@
- __asm __volatile("hlt");
- }
-
--static __inline u_char
--inb(unsigned int port)
--{
-- unsigned char data;
--
-- __asm __volatile("inb %w1, %0" : "=a" (data) : "Nd" (port));
-- return (data);
--}
--
--static __inline u_int
--inl(unsigned int port)
--{
-- unsigned int data;
--
-- __asm __volatile("inl %w1, %0" : "=a" (data) : "Nd" (port));
-- return (data);
--}
--
--static __inline void
--insb(unsigned int port, void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; insb"
-- : "+D" (addr), "+c" (count)
-- : "d" (port)
-- : "memory");
--}
--
--static __inline void
--insw(unsigned int port, void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; insw"
-- : "+D" (addr), "+c" (count)
-- : "d" (port)
-- : "memory");
--}
--
--static __inline void
--insl(unsigned int port, void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; insl"
-- : "+D" (addr), "+c" (count)
-- : "d" (port)
-- : "memory");
--}
--
--static __inline void
--invd(void)
--{
-- __asm __volatile("invd");
--}
--
--static __inline u_short
--inw(unsigned int port)
--{
-- unsigned short data;
--
-- __asm __volatile("inw %w1, %0" : "=a" (data) : "Nd" (port));
-- return (data);
--}
--
--static __inline void
--outb(unsigned int port, unsigned char data)
--{
-- __asm __volatile("outb %0, %w1" : : "a" (data), "Nd" (port));
--}
--
--static __inline void
--outl(unsigned int port, unsigned int data)
--{
-- __asm __volatile("outl %0, %w1" : : "a" (data), "Nd" (port));
--}
--
--static __inline void
--outsb(unsigned int port, const void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; outsb"
-- : "+S" (addr), "+c" (count)
-- : "d" (port));
--}
--
--static __inline void
--outsw(unsigned int port, const void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; outsw"
-- : "+S" (addr), "+c" (count)
-- : "d" (port));
--}
--
--static __inline void
--outsl(unsigned int port, const void *addr, size_t count)
--{
-- __asm __volatile("cld; rep; outsl"
-- : "+S" (addr), "+c" (count)
-- : "d" (port));
--}
--
--static __inline void
--outw(unsigned int port, unsigned short data)
--{
-- __asm __volatile("outw %0, %w1" : : "a" (data), "Nd" (port));
--}
--
- static __inline void
- ia32_pause(void)
- {
Copied: trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff (from rev 4114, trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff)
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff 2012-02-25 11:45:47 UTC (rev 4116)
@@ -0,0 +1,276 @@
+
+See #660396
+
+--- a/sys/amd64/include/cpufunc.h
++++ b/sys/amd64/include/cpufunc.h
+@@ -41,6 +41,9 @@
+
+ #include <sys/types.h>
+
++#include <stdint.h>
++#include <sys/io.h>
++
+ #ifndef _SYS_CDEFS_H
+ #error this file needs sys/cdefs.h as a prerequisite
+ #endif
+@@ -173,108 +176,6 @@
+ __asm __volatile("hlt");
+ }
+
+-static __inline u_char
+-inb(unsigned int port)
+-{
+- unsigned char data;
+-
+- __asm __volatile("inb %w1, %0" : "=a" (data) : "Nd" (port));
+- return (data);
+-}
+-
+-static __inline u_int
+-inl(unsigned int port)
+-{
+- unsigned int data;
+-
+- __asm __volatile("inl %w1, %0" : "=a" (data) : "Nd" (port));
+- return (data);
+-}
+-
+-static __inline void
+-insb(unsigned int port, void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; insb"
+- : "+D" (addr), "+c" (count)
+- : "d" (port)
+- : "memory");
+-}
+-
+-static __inline void
+-insw(unsigned int port, void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; insw"
+- : "+D" (addr), "+c" (count)
+- : "d" (port)
+- : "memory");
+-}
+-
+-static __inline void
+-insl(unsigned int port, void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; insl"
+- : "+D" (addr), "+c" (count)
+- : "d" (port)
+- : "memory");
+-}
+-
+-static __inline void
+-invd(void)
+-{
+- __asm __volatile("invd");
+-}
+-
+-static __inline u_short
+-inw(unsigned int port)
+-{
+- unsigned short data;
+-
+- __asm __volatile("inw %w1, %0" : "=a" (data) : "Nd" (port));
+- return (data);
+-}
+-
+-static __inline void
+-outb(unsigned int port, unsigned char data)
+-{
+- __asm __volatile("outb %0, %w1" : : "a" (data), "Nd" (port));
+-}
+-
+-static __inline void
+-outl(unsigned int port, unsigned int data)
+-{
+- __asm __volatile("outl %0, %w1" : : "a" (data), "Nd" (port));
+-}
+-
+-static __inline void
+-outsb(unsigned int port, const void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; outsb"
+- : "+S" (addr), "+c" (count)
+- : "d" (port));
+-}
+-
+-static __inline void
+-outsw(unsigned int port, const void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; outsw"
+- : "+S" (addr), "+c" (count)
+- : "d" (port));
+-}
+-
+-static __inline void
+-outsl(unsigned int port, const void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; outsl"
+- : "+S" (addr), "+c" (count)
+- : "d" (port));
+-}
+-
+-static __inline void
+-outw(unsigned int port, unsigned short data)
+-{
+- __asm __volatile("outw %0, %w1" : : "a" (data), "Nd" (port));
+-}
+-
+ static __inline void
+ mfence(void)
+ {
+--- a/sys/mips/include/cpufunc.h
++++ b/sys/mips/include/cpufunc.h
+@@ -60,6 +60,7 @@
+ #define _MACHINE_CPUFUNC_H_
+
+ #include <sys/types.h>
++#include <stdint.h>
+ #include <machine/cpuregs.h>
+
+ /*
+--- a/sys/powerpc/include/cpufunc.h
++++ b/sys/powerpc/include/cpufunc.h
+@@ -29,6 +29,8 @@
+ #ifndef _MACHINE_CPUFUNC_H_
+ #define _MACHINE_CPUFUNC_H_
+
++#include <stdint.h>
++
+ /*
+ * Required for user-space atomic.h includes
+ */
+--- a/sys/sparc64/include/cpufunc.h
++++ b/sys/sparc64/include/cpufunc.h
+@@ -29,6 +29,7 @@
+ #ifndef _MACHINE_CPUFUNC_H_
+ #define _MACHINE_CPUFUNC_H_
+
++#include <stdint.h>
+ #include <machine/asi.h>
+ #include <machine/pstate.h>
+
+--- a/sys/i386/include/cpufunc.h
++++ b/sys/i386/include/cpufunc.h
+@@ -40,6 +40,9 @@
+
+ #include <sys/types.h>
+
++#include <stdint.h>
++#include <sys/io.h>
++
+ #ifndef _SYS_CDEFS_H
+ #error this file needs sys/cdefs.h as a prerequisite
+ #endif
+@@ -188,108 +191,6 @@
+ __asm __volatile("hlt");
+ }
+
+-static __inline u_char
+-inb(unsigned int port)
+-{
+- unsigned char data;
+-
+- __asm __volatile("inb %w1, %0" : "=a" (data) : "Nd" (port));
+- return (data);
+-}
+-
+-static __inline u_int
+-inl(unsigned int port)
+-{
+- unsigned int data;
+-
+- __asm __volatile("inl %w1, %0" : "=a" (data) : "Nd" (port));
+- return (data);
+-}
+-
+-static __inline void
+-insb(unsigned int port, void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; insb"
+- : "+D" (addr), "+c" (count)
+- : "d" (port)
+- : "memory");
+-}
+-
+-static __inline void
+-insw(unsigned int port, void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; insw"
+- : "+D" (addr), "+c" (count)
+- : "d" (port)
+- : "memory");
+-}
+-
+-static __inline void
+-insl(unsigned int port, void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; insl"
+- : "+D" (addr), "+c" (count)
+- : "d" (port)
+- : "memory");
+-}
+-
+-static __inline void
+-invd(void)
+-{
+- __asm __volatile("invd");
+-}
+-
+-static __inline u_short
+-inw(unsigned int port)
+-{
+- unsigned short data;
+-
+- __asm __volatile("inw %w1, %0" : "=a" (data) : "Nd" (port));
+- return (data);
+-}
+-
+-static __inline void
+-outb(unsigned int port, unsigned char data)
+-{
+- __asm __volatile("outb %0, %w1" : : "a" (data), "Nd" (port));
+-}
+-
+-static __inline void
+-outl(unsigned int port, unsigned int data)
+-{
+- __asm __volatile("outl %0, %w1" : : "a" (data), "Nd" (port));
+-}
+-
+-static __inline void
+-outsb(unsigned int port, const void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; outsb"
+- : "+S" (addr), "+c" (count)
+- : "d" (port));
+-}
+-
+-static __inline void
+-outsw(unsigned int port, const void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; outsw"
+- : "+S" (addr), "+c" (count)
+- : "d" (port));
+-}
+-
+-static __inline void
+-outsl(unsigned int port, const void *addr, size_t count)
+-{
+- __asm __volatile("cld; rep; outsl"
+- : "+S" (addr), "+c" (count)
+- : "d" (port));
+-}
+-
+-static __inline void
+-outw(unsigned int port, unsigned short data)
+-{
+- __asm __volatile("outw %0, %w1" : : "a" (data), "Nd" (port));
+-}
+-
+ static __inline void
+ ia32_pause(void)
+ {
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2012-02-25 11:43:11 UTC (rev 4115)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2012-02-25 11:45:47 UTC (rev 4116)
@@ -17,7 +17,7 @@
010_glibc.diff
011_wine.diff
013_mips.diff
-014_misc.diff
+cpufunc.diff
015_cam.diff
018_sys__types.diff
019_exec_pagesize.diff
More information about the Glibc-bsd-commits
mailing list