[PATCH] h8300 header update
- page.h: fix build error
- unistd.h: _syscall macro cleanup.
plase apply.
--
Yoshinori Sato
<[EMAIL PROTECTED]>
--- 1.3/include/asm-h8300/page.h2005-01-31 15:20:53 +09:00
+++ edited/include/asm-h8300/page.h 2005-04-01 23:41:26 +09:00
@@ -79,7 +79,7 @@
#ifndef __ASSEMBLY__
-#define __pa(vaddr)virt_to_phys((void *)vaddr)
+#define __pa(vaddr)virt_to_phys(vaddr)
#define __va(paddr)phys_to_virt((unsigned long)paddr)
#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
@@ -89,7 +89,7 @@
#define virt_to_page(addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET)
>> PAGE_SHIFT))
#define virt_to_page(addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET)
>> PAGE_SHIFT))
#define page_to_virt(page) page) - mem_map) << PAGE_SHIFT) +
PAGE_OFFSET)
-#define VALID_PAGE(page) ((page - mem_map) < max_mapnr)
+#define pfn_valid(page)(page < max_mapnr)
#define pfn_to_page(pfn) virt_to_page(pfn_to_virt(pfn))
#define page_to_pfn(page) virt_to_pfn(page_to_virt(page))
= include/asm-h8300/unistd.h 1.9 vs edited =
--- 1.9/include/asm-h8300/unistd.h 2005-01-13 01:57:21 +09:00
+++ edited/include/asm-h8300/unistd.h 2005-04-11 00:16:07 +09:00
@@ -310,163 +310,155 @@
return (type) (res); \
} while (0)
-#define _syscall0(type, name)
\
-type name(void)
\
-{
\
- register long __res __asm__("er0");
\
- __asm__ __volatile__ ("mov.l %1,er0\n\t"
\
- "trapa #0\n\t"
\
- : "=r" (__res)
\
- : "ir" (__NR_##name)
\
- : "cc");
\
- if ((unsigned long)(__res) >= (unsigned long)(-125)) {
\
-errno = -__res;
\
-__res = -1;
\
- }
\
- return (type)__res;
\
-}
-
-#define _syscall1(type, name, atype, a)
\
-type name(atype a)
\
-{
\
- register long __res __asm__("er0");
\
- __asm__ __volatile__ ("mov.l %2, er1\n\t"
\
- "mov.l %1, er0\n\t"
\
- "trapa #0\n\t"
\
- : "=r" (__res)
\
- : "ir" (__NR_##name),
\
- "g" ((long)a)
\
- : "cc", "er1"); \
- if ((unsigned long)(__res) >= (unsigned long)(-125)) {
\
-errno = -__res;
\
-__res = -1;
\
- }
\
- return (type)__res;
\
-}
-
-#define _syscall2(type, name, atype, a, btype, b)
\
-type name(atype a, btype b)
\
-{
\
- register long __res __asm__("er0");
\
- __asm__ __volatile__ ("mov.l %3, er2\n\t"
\
- "mov.l %2, er1\n\t"
\
- "mov.l %1, er0\n\t"
\
- "trapa #0\n\t"
\
- : "=r" (__res)
\
- : "ir" (__NR_##name),
\
- "g" ((long)a),
\
- "g" ((long)b)
\
- : "cc", "er1", "er2"); \
- if ((unsigned long)(__res) >= (unsigned long)(-125)) {
[PATCH] h8300 header update
- page.h: fix build error
- unistd.h: _syscall macro cleanup.
plase apply.
--
Yoshinori Sato
[EMAIL PROTECTED]
--- 1.3/include/asm-h8300/page.h2005-01-31 15:20:53 +09:00
+++ edited/include/asm-h8300/page.h 2005-04-01 23:41:26 +09:00
@@ -79,7 +79,7 @@
#ifndef __ASSEMBLY__
-#define __pa(vaddr)virt_to_phys((void *)vaddr)
+#define __pa(vaddr)virt_to_phys(vaddr)
#define __va(paddr)phys_to_virt((unsigned long)paddr)
#define virt_to_pfn(kaddr) (__pa(kaddr) PAGE_SHIFT)
@@ -89,7 +89,7 @@
#define virt_to_page(addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET)
PAGE_SHIFT))
#define virt_to_page(addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET)
PAGE_SHIFT))
#define page_to_virt(page) page) - mem_map) PAGE_SHIFT) +
PAGE_OFFSET)
-#define VALID_PAGE(page) ((page - mem_map) max_mapnr)
+#define pfn_valid(page)(page max_mapnr)
#define pfn_to_page(pfn) virt_to_page(pfn_to_virt(pfn))
#define page_to_pfn(page) virt_to_pfn(page_to_virt(page))
= include/asm-h8300/unistd.h 1.9 vs edited =
--- 1.9/include/asm-h8300/unistd.h 2005-01-13 01:57:21 +09:00
+++ edited/include/asm-h8300/unistd.h 2005-04-11 00:16:07 +09:00
@@ -310,163 +310,155 @@
return (type) (res); \
} while (0)
-#define _syscall0(type, name)
\
-type name(void)
\
-{
\
- register long __res __asm__(er0);
\
- __asm__ __volatile__ (mov.l %1,er0\n\t
\
- trapa #0\n\t
\
- : =r (__res)
\
- : ir (__NR_##name)
\
- : cc);
\
- if ((unsigned long)(__res) = (unsigned long)(-125)) {
\
-errno = -__res;
\
-__res = -1;
\
- }
\
- return (type)__res;
\
-}
-
-#define _syscall1(type, name, atype, a)
\
-type name(atype a)
\
-{
\
- register long __res __asm__(er0);
\
- __asm__ __volatile__ (mov.l %2, er1\n\t
\
- mov.l %1, er0\n\t
\
- trapa #0\n\t
\
- : =r (__res)
\
- : ir (__NR_##name),
\
- g ((long)a)
\
- : cc, er1); \
- if ((unsigned long)(__res) = (unsigned long)(-125)) {
\
-errno = -__res;
\
-__res = -1;
\
- }
\
- return (type)__res;
\
-}
-
-#define _syscall2(type, name, atype, a, btype, b)
\
-type name(atype a, btype b)
\
-{
\
- register long __res __asm__(er0);
\
- __asm__ __volatile__ (mov.l %3, er2\n\t
\
- mov.l %2, er1\n\t
\
- mov.l %1, er0\n\t
\
- trapa #0\n\t
\
- : =r (__res)
\
- : ir (__NR_##name),
\
- g ((long)a),
\
- g ((long)b)
\
- : cc, er1, er2); \
- if ((unsigned long)(__res) = (unsigned long)(-125)) {
\
-errno = -__res;
