Changeset 6742797
- Timestamp:
- Jun 28, 2006, 5:56:55 PM (18 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 6c32364
- Parents:
- aaecc3ab
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/aboot-0.9b-kernel26_gcc4_fixes-4.patch
raaecc3ab r6742797 10 10 system. 11 11 12 diff -Naur aboot-0.9b.orig/Makefile aboot-0.9b/Makefile13 --- aboot-0.9b.orig/Makefile 2002-09-18 15:48:21.000000000 -040014 +++ aboot-0.9b/Makefile 2006-06-25 18:22:04.000000000 -040015 @@ -23,7 +23,7 @@16 root =17 bindir = $(root)/sbin18 bootdir = $(root)/boot19 -mandir = /usr/man20 +mandir = $(root)/usr/man21 22 #23 # There shouldn't be any need to change anything below this line.24 @@ -82,10 +82,10 @@25 tools/objstrip -vb aboot bootlx26 27 install-man:28 - make -C doc/man install29 + $(MAKE) -C doc/man install30 31 install-man-gz:32 - make -C doc/man install-gz33 + $(MAKE) -C doc/man install-gz34 35 install: tools/abootconf tools/e2writeboot tools/isomarkboot \36 sdisklabel/swriteboot install-man37 @@ -128,13 +128,13 @@38 find . -name \*~ | xargs rm -f39 40 lib/%:41 - make -C lib $* CPPFLAGS="$(CPPFLAGS)" TESTING="$(TESTING)"42 + $(MAKE) -C lib $* CPPFLAGS="$(CPPFLAGS)" TESTING="$(TESTING)"43 44 tools/%:45 - make -C tools $* CPPFLAGS="$(CPPFLAGS)"46 + $(MAKE) -C tools $* CPPFLAGS="$(CPPFLAGS)"47 48 sdisklabel/%:49 - make -C sdisklabel $* CPPFLAGS="$(CPPFLAGS)"50 + $(MAKE) -C sdisklabel $* CPPFLAGS="$(CPPFLAGS)"51 52 vmlinux.nh: $(VMLINUX) tools/objstrip53 tools/objstrip -vb $(VMLINUX) vmlinux.nh54 12 diff -Naur aboot-0.9b.orig/cons.c aboot-0.9b/cons.c 55 --- aboot-0.9b.orig/cons.c 200 1-10-08 19:03:50.000000000 -040056 +++ aboot-0.9b/cons.c 2006-06-2 5 18:22:04.000000000 -040013 --- aboot-0.9b.orig/cons.c 2006-06-27 22:01:25.000000000 -0400 14 +++ aboot-0.9b/cons.c 2006-06-27 22:02:47.000000000 -0400 57 15 @@ -12,7 +12,7 @@ 58 16 #include <utils.h> … … 65 23 cons_puts(const char *str, long len) 66 24 diff -Naur aboot-0.9b.orig/disk.c aboot-0.9b/disk.c 67 --- aboot-0.9b.orig/disk.c 200 1-10-09 16:45:57.000000000 -040068 +++ aboot-0.9b/disk.c 2006-06-2 5 18:22:04.000000000 -040025 --- aboot-0.9b.orig/disk.c 2006-06-27 22:01:25.000000000 -0400 26 +++ aboot-0.9b/disk.c 2006-06-27 22:02:47.000000000 -0400 69 27 @@ -480,9 +480,7 @@ 70 28 } else { … … 79 37 } 80 38 diff -Naur aboot-0.9b.orig/doc/man/Makefile aboot-0.9b/doc/man/Makefile 81 --- aboot-0.9b.orig/doc/man/Makefile 200 3-01-14 15:12:14.000000000 -050082 +++ aboot-0.9b/doc/man/Makefile 2006-06-2 5 18:22:04.000000000 -040039 --- aboot-0.9b.orig/doc/man/Makefile 2006-06-27 22:01:25.000000000 -0400 40 +++ aboot-0.9b/doc/man/Makefile 2006-06-27 22:02:47.000000000 -0400 83 41 @@ -6,7 +6,7 @@ 84 42 # use that value. Otherwise default to /usr/man. … … 92 50 diff -Naur aboot-0.9b.orig/include/asm/a.out.h aboot-0.9b/include/asm/a.out.h 93 51 --- aboot-0.9b.orig/include/asm/a.out.h 1969-12-31 19:00:00.000000000 -0500 94 +++ aboot-0.9b/include/asm/a.out.h 2006-06-2 5 18:22:04.000000000 -040052 +++ aboot-0.9b/include/asm/a.out.h 2006-06-27 22:02:47.000000000 -0400 95 53 @@ -0,0 +1,91 @@ 96 54 +#ifndef __ALPHA_A_OUT_H__ … … 187 145 diff -Naur aboot-0.9b.orig/include/asm/auxvec.h aboot-0.9b/include/asm/auxvec.h 188 146 --- aboot-0.9b.orig/include/asm/auxvec.h 1969-12-31 19:00:00.000000000 -0500 189 +++ aboot-0.9b/include/asm/auxvec.h 2006-06-2 5 18:22:04.000000000 -0400147 +++ aboot-0.9b/include/asm/auxvec.h 2006-06-27 22:02:47.000000000 -0400 190 148 @@ -0,0 +1,24 @@ 191 149 +#ifndef __ASM_ALPHA_AUXVEC_H … … 215 173 diff -Naur aboot-0.9b.orig/include/asm/barrier.h aboot-0.9b/include/asm/barrier.h 216 174 --- aboot-0.9b.orig/include/asm/barrier.h 1969-12-31 19:00:00.000000000 -0500 217 +++ aboot-0.9b/include/asm/barrier.h 2006-06-2 5 18:22:04.000000000 -0400175 +++ aboot-0.9b/include/asm/barrier.h 2006-06-27 22:02:47.000000000 -0400 218 176 @@ -0,0 +1,34 @@ 219 177 +#ifndef __BARRIER_H … … 253 211 diff -Naur aboot-0.9b.orig/include/asm/hwrpb.h aboot-0.9b/include/asm/hwrpb.h 254 212 --- aboot-0.9b.orig/include/asm/hwrpb.h 1969-12-31 19:00:00.000000000 -0500 255 +++ aboot-0.9b/include/asm/hwrpb.h 2006-06-2 5 18:22:04.000000000 -0400213 +++ aboot-0.9b/include/asm/hwrpb.h 2006-06-27 22:02:47.000000000 -0400 256 214 @@ -0,0 +1,205 @@ 257 215 +#ifndef __ALPHA_HWRPB_H … … 462 420 diff -Naur aboot-0.9b.orig/include/asm/page.h aboot-0.9b/include/asm/page.h 463 421 --- aboot-0.9b.orig/include/asm/page.h 1969-12-31 19:00:00.000000000 -0500 464 +++ aboot-0.9b/include/asm/page.h 2006-06-2 5 18:22:04.000000000 -0400422 +++ aboot-0.9b/include/asm/page.h 2006-06-27 22:02:47.000000000 -0400 465 423 @@ -0,0 +1,103 @@ 466 424 +#ifndef _ALPHA_PAGE_H … … 569 527 diff -Naur aboot-0.9b.orig/include/asm/pal.h aboot-0.9b/include/asm/pal.h 570 528 --- aboot-0.9b.orig/include/asm/pal.h 1969-12-31 19:00:00.000000000 -0500 571 +++ aboot-0.9b/include/asm/pal.h 2006-06-2 5 18:22:04.000000000 -0400529 +++ aboot-0.9b/include/asm/pal.h 2006-06-27 22:02:47.000000000 -0400 572 530 @@ -0,0 +1,51 @@ 573 531 +#ifndef __ALPHA_PAL_H … … 624 582 diff -Naur aboot-0.9b.orig/include/asm/spinlock.h aboot-0.9b/include/asm/spinlock.h 625 583 --- aboot-0.9b.orig/include/asm/spinlock.h 1969-12-31 19:00:00.000000000 -0500 626 +++ aboot-0.9b/include/asm/spinlock.h 2006-06-2 5 18:22:04.000000000 -0400584 +++ aboot-0.9b/include/asm/spinlock.h 2006-06-27 22:02:47.000000000 -0400 627 585 @@ -0,0 +1,170 @@ 628 586 +#ifndef _ALPHA_SPINLOCK_H … … 798 756 diff -Naur aboot-0.9b.orig/include/asm/spinlock_types.h aboot-0.9b/include/asm/spinlock_types.h 799 757 --- aboot-0.9b.orig/include/asm/spinlock_types.h 1969-12-31 19:00:00.000000000 -0500 800 +++ aboot-0.9b/include/asm/spinlock_types.h 2006-06-2 5 18:22:04.000000000 -0400758 +++ aboot-0.9b/include/asm/spinlock_types.h 2006-06-27 22:02:47.000000000 -0400 801 759 @@ -0,0 +1,20 @@ 802 760 +#ifndef _ALPHA_SPINLOCK_TYPES_H … … 822 780 diff -Naur aboot-0.9b.orig/include/asm/string.h aboot-0.9b/include/asm/string.h 823 781 --- aboot-0.9b.orig/include/asm/string.h 1969-12-31 19:00:00.000000000 -0500 824 +++ aboot-0.9b/include/asm/string.h 2006-06-2 5 18:22:04.000000000 -0400782 +++ aboot-0.9b/include/asm/string.h 2006-06-27 22:02:47.000000000 -0400 825 783 @@ -0,0 +1,68 @@ 826 784 +#ifndef __ALPHA_STRING_H__ … … 894 852 diff -Naur aboot-0.9b.orig/include/asm/system.h aboot-0.9b/include/asm/system.h 895 853 --- aboot-0.9b.orig/include/asm/system.h 1969-12-31 19:00:00.000000000 -0500 896 +++ aboot-0.9b/include/asm/system.h 2006-06-2 5 18:22:04.000000000 -0400854 +++ aboot-0.9b/include/asm/system.h 2006-06-27 22:02:47.000000000 -0400 897 855 @@ -0,0 +1,594 @@ 898 856 +#ifndef __ALPHA_SYSTEM_H … … 1492 1450 diff -Naur aboot-0.9b.orig/include/asm/thread_info.h aboot-0.9b/include/asm/thread_info.h 1493 1451 --- aboot-0.9b.orig/include/asm/thread_info.h 1969-12-31 19:00:00.000000000 -0500 1494 +++ aboot-0.9b/include/asm/thread_info.h 2006-06-2 5 18:22:04.000000000 -04001452 +++ aboot-0.9b/include/asm/thread_info.h 2006-06-27 22:02:47.000000000 -0400 1495 1453 @@ -0,0 +1,96 @@ 1496 1454 +#ifndef _ALPHA_THREAD_INFO_H … … 1590 1548 +#endif /* __KERNEL__ */ 1591 1549 +#endif /* _ALPHA_THREAD_INFO_H */ 1550 diff -Naur aboot-0.9b.orig/include/asm-generic/bitops/find.h aboot-0.9b/include/asm-generic/bitops/find.h 1551 --- aboot-0.9b.orig/include/asm-generic/bitops/find.h 1969-12-31 19:00:00.000000000 -0500 1552 +++ aboot-0.9b/include/asm-generic/bitops/find.h 2006-06-27 22:02:02.000000000 -0400 1553 @@ -0,0 +1 @@ 1554 +/* Dummy Header */ 1592 1555 diff -Naur aboot-0.9b.orig/include/asm-generic/page.h aboot-0.9b/include/asm-generic/page.h 1593 1556 --- aboot-0.9b.orig/include/asm-generic/page.h 1969-12-31 19:00:00.000000000 -0500 1594 +++ aboot-0.9b/include/asm-generic/page.h 2006-06-2 5 18:22:04.000000000 -04001557 +++ aboot-0.9b/include/asm-generic/page.h 2006-06-27 22:02:47.000000000 -0400 1595 1558 @@ -0,0 +1,27 @@ 1596 1559 +#ifndef _ASM_GENERIC_PAGE_H … … 1623 1586 diff -Naur aboot-0.9b.orig/include/linux/auxvec.h aboot-0.9b/include/linux/auxvec.h 1624 1587 --- aboot-0.9b.orig/include/linux/auxvec.h 1969-12-31 19:00:00.000000000 -0500 1625 +++ aboot-0.9b/include/linux/auxvec.h 2006-06-2 5 18:22:04.000000000 -04001588 +++ aboot-0.9b/include/linux/auxvec.h 2006-06-27 22:02:47.000000000 -0400 1626 1589 @@ -0,0 +1,31 @@ 1627 1590 +#ifndef _LINUX_AUXVEC_H … … 1658 1621 diff -Naur aboot-0.9b.orig/include/linux/blockgroup_lock.h aboot-0.9b/include/linux/blockgroup_lock.h 1659 1622 --- aboot-0.9b.orig/include/linux/blockgroup_lock.h 1969-12-31 19:00:00.000000000 -0500 1660 +++ aboot-0.9b/include/linux/blockgroup_lock.h 2006-06-2 5 18:22:04.000000000 -04001623 +++ aboot-0.9b/include/linux/blockgroup_lock.h 2006-06-27 22:02:47.000000000 -0400 1661 1624 @@ -0,0 +1,60 @@ 1662 1625 +#ifndef _LINUX_BLOCKGROUP_LOCK_H … … 1722 1685 diff -Naur aboot-0.9b.orig/include/linux/config.h aboot-0.9b/include/linux/config.h 1723 1686 --- aboot-0.9b.orig/include/linux/config.h 1969-12-31 19:00:00.000000000 -0500 1724 +++ aboot-0.9b/include/linux/config.h 2006-06-2 5 18:22:38.000000000 -04001687 +++ aboot-0.9b/include/linux/config.h 2006-06-27 22:02:47.000000000 -0400 1725 1688 @@ -0,0 +1 @@ 1726 1689 +/* Dummy Config.h */ 1727 1690 diff -Naur aboot-0.9b.orig/include/linux/elf.h aboot-0.9b/include/linux/elf.h 1728 1691 --- aboot-0.9b.orig/include/linux/elf.h 1969-12-31 19:00:00.000000000 -0500 1729 +++ aboot-0.9b/include/linux/elf.h 2006-06-2 5 18:22:04.000000000 -04001692 +++ aboot-0.9b/include/linux/elf.h 2006-06-27 22:02:47.000000000 -0400 1730 1693 @@ -0,0 +1,427 @@ 1731 1694 +#ifndef _LINUX_ELF_H … … 2156 2119 + 2157 2120 +#endif /* _LINUX_ELF_H */ 2121 diff -Naur aboot-0.9b.orig/include/linux/spinlock_api_smp.h aboot-0.9b/include/linux/spinlock_api_smp.h 2122 --- aboot-0.9b.orig/include/linux/spinlock_api_smp.h 1969-12-31 19:00:00.000000000 -0500 2123 +++ aboot-0.9b/include/linux/spinlock_api_smp.h 2006-06-27 22:02:47.000000000 -0400 2124 @@ -0,0 +1,57 @@ 2125 +#ifndef __LINUX_SPINLOCK_API_SMP_H 2126 +#define __LINUX_SPINLOCK_API_SMP_H 2127 + 2128 +#ifndef __LINUX_SPINLOCK_H 2129 +# error "please don't include this file directly" 2130 +#endif 2131 + 2132 +/* 2133 + * include/linux/spinlock_api_smp.h 2134 + * 2135 + * spinlock API declarations on SMP (and debug) 2136 + * (implemented in kernel/spinlock.c) 2137 + * 2138 + * portions Copyright 2005, Red Hat, Inc., Ingo Molnar 2139 + * Released under the General Public License (GPL). 2140 + */ 2141 + 2142 +int in_lock_functions(unsigned long addr); 2143 + 2144 +#define assert_spin_locked(x) BUG_ON(!spin_is_locked(x)) 2145 + 2146 +void __lockfunc _spin_lock(spinlock_t *lock) __acquires(spinlock_t); 2147 +void __lockfunc _read_lock(rwlock_t *lock) __acquires(rwlock_t); 2148 +void __lockfunc _write_lock(rwlock_t *lock) __acquires(rwlock_t); 2149 +void __lockfunc _spin_lock_bh(spinlock_t *lock) __acquires(spinlock_t); 2150 +void __lockfunc _read_lock_bh(rwlock_t *lock) __acquires(rwlock_t); 2151 +void __lockfunc _write_lock_bh(rwlock_t *lock) __acquires(rwlock_t); 2152 +void __lockfunc _spin_lock_irq(spinlock_t *lock) __acquires(spinlock_t); 2153 +void __lockfunc _read_lock_irq(rwlock_t *lock) __acquires(rwlock_t); 2154 +void __lockfunc _write_lock_irq(rwlock_t *lock) __acquires(rwlock_t); 2155 +unsigned long __lockfunc _spin_lock_irqsave(spinlock_t *lock) 2156 + __acquires(spinlock_t); 2157 +unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock) 2158 + __acquires(rwlock_t); 2159 +unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock) 2160 + __acquires(rwlock_t); 2161 +int __lockfunc _spin_trylock(spinlock_t *lock); 2162 +int __lockfunc _read_trylock(rwlock_t *lock); 2163 +int __lockfunc _write_trylock(rwlock_t *lock); 2164 +int __lockfunc _spin_trylock_bh(spinlock_t *lock); 2165 +void __lockfunc _spin_unlock(spinlock_t *lock) __releases(spinlock_t); 2166 +void __lockfunc _read_unlock(rwlock_t *lock) __releases(rwlock_t); 2167 +void __lockfunc _write_unlock(rwlock_t *lock) __releases(rwlock_t); 2168 +void __lockfunc _spin_unlock_bh(spinlock_t *lock) __releases(spinlock_t); 2169 +void __lockfunc _read_unlock_bh(rwlock_t *lock) __releases(rwlock_t); 2170 +void __lockfunc _write_unlock_bh(rwlock_t *lock) __releases(rwlock_t); 2171 +void __lockfunc _spin_unlock_irq(spinlock_t *lock) __releases(spinlock_t); 2172 +void __lockfunc _read_unlock_irq(rwlock_t *lock) __releases(rwlock_t); 2173 +void __lockfunc _write_unlock_irq(rwlock_t *lock) __releases(rwlock_t); 2174 +void __lockfunc _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags) 2175 + __releases(spinlock_t); 2176 +void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) 2177 + __releases(rwlock_t); 2178 +void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) 2179 + __releases(rwlock_t); 2180 + 2181 +#endif /* __LINUX_SPINLOCK_API_SMP_H */ 2182 diff -Naur aboot-0.9b.orig/include/linux/spinlock_api_up.h aboot-0.9b/include/linux/spinlock_api_up.h 2183 --- aboot-0.9b.orig/include/linux/spinlock_api_up.h 1969-12-31 19:00:00.000000000 -0500 2184 +++ aboot-0.9b/include/linux/spinlock_api_up.h 2006-06-27 22:02:47.000000000 -0400 2185 @@ -0,0 +1,80 @@ 2186 +#ifndef __LINUX_SPINLOCK_API_UP_H 2187 +#define __LINUX_SPINLOCK_API_UP_H 2188 + 2189 +#ifndef __LINUX_SPINLOCK_H 2190 +# error "please don't include this file directly" 2191 +#endif 2192 + 2193 +/* 2194 + * include/linux/spinlock_api_up.h 2195 + * 2196 + * spinlock API implementation on UP-nondebug (inlined implementation) 2197 + * 2198 + * portions Copyright 2005, Red Hat, Inc., Ingo Molnar 2199 + * Released under the General Public License (GPL). 2200 + */ 2201 + 2202 +#define in_lock_functions(ADDR) 0 2203 + 2204 +#define assert_spin_locked(lock) do { (void)(lock); } while (0) 2205 + 2206 +/* 2207 + * In the UP-nondebug case there's no real locking going on, so the 2208 + * only thing we have to do is to keep the preempt counts and irq 2209 + * flags straight, to supress compiler warnings of unused lock 2210 + * variables, and to add the proper checker annotations: 2211 + */ 2212 +#define __LOCK(lock) \ 2213 + do { preempt_disable(); __acquire(lock); (void)(lock); } while (0) 2214 + 2215 +#define __LOCK_BH(lock) \ 2216 + do { local_bh_disable(); __LOCK(lock); } while (0) 2217 + 2218 +#define __LOCK_IRQ(lock) \ 2219 + do { local_irq_disable(); __LOCK(lock); } while (0) 2220 + 2221 +#define __LOCK_IRQSAVE(lock, flags) \ 2222 + do { local_irq_save(flags); __LOCK(lock); } while (0) 2223 + 2224 +#define __UNLOCK(lock) \ 2225 + do { preempt_enable(); __release(lock); (void)(lock); } while (0) 2226 + 2227 +#define __UNLOCK_BH(lock) \ 2228 + do { preempt_enable_no_resched(); local_bh_enable(); __release(lock); (void)(lock); } while (0) 2229 + 2230 +#define __UNLOCK_IRQ(lock) \ 2231 + do { local_irq_enable(); __UNLOCK(lock); } while (0) 2232 + 2233 +#define __UNLOCK_IRQRESTORE(lock, flags) \ 2234 + do { local_irq_restore(flags); __UNLOCK(lock); } while (0) 2235 + 2236 +#define _spin_lock(lock) __LOCK(lock) 2237 +#define _read_lock(lock) __LOCK(lock) 2238 +#define _write_lock(lock) __LOCK(lock) 2239 +#define _spin_lock_bh(lock) __LOCK_BH(lock) 2240 +#define _read_lock_bh(lock) __LOCK_BH(lock) 2241 +#define _write_lock_bh(lock) __LOCK_BH(lock) 2242 +#define _spin_lock_irq(lock) __LOCK_IRQ(lock) 2243 +#define _read_lock_irq(lock) __LOCK_IRQ(lock) 2244 +#define _write_lock_irq(lock) __LOCK_IRQ(lock) 2245 +#define _spin_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags) 2246 +#define _read_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags) 2247 +#define _write_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags) 2248 +#define _spin_trylock(lock) ({ __LOCK(lock); 1; }) 2249 +#define _read_trylock(lock) ({ __LOCK(lock); 1; }) 2250 +#define _write_trylock(lock) ({ __LOCK(lock); 1; }) 2251 +#define _spin_trylock_bh(lock) ({ __LOCK_BH(lock); 1; }) 2252 +#define _spin_unlock(lock) __UNLOCK(lock) 2253 +#define _read_unlock(lock) __UNLOCK(lock) 2254 +#define _write_unlock(lock) __UNLOCK(lock) 2255 +#define _spin_unlock_bh(lock) __UNLOCK_BH(lock) 2256 +#define _write_unlock_bh(lock) __UNLOCK_BH(lock) 2257 +#define _read_unlock_bh(lock) __UNLOCK_BH(lock) 2258 +#define _spin_unlock_irq(lock) __UNLOCK_IRQ(lock) 2259 +#define _read_unlock_irq(lock) __UNLOCK_IRQ(lock) 2260 +#define _write_unlock_irq(lock) __UNLOCK_IRQ(lock) 2261 +#define _spin_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags) 2262 +#define _read_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags) 2263 +#define _write_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags) 2264 + 2265 +#endif /* __LINUX_SPINLOCK_API_UP_H */ 2158 2266 diff -Naur aboot-0.9b.orig/include/linux/spinlock.h aboot-0.9b/include/linux/spinlock.h 2159 2267 --- aboot-0.9b.orig/include/linux/spinlock.h 1969-12-31 19:00:00.000000000 -0500 2160 +++ aboot-0.9b/include/linux/spinlock.h 2006-06-2 5 18:22:04.000000000 -04002268 +++ aboot-0.9b/include/linux/spinlock.h 2006-06-27 22:02:47.000000000 -0400 2161 2269 @@ -0,0 +1,247 @@ 2162 2270 +#ifndef __LINUX_SPINLOCK_H … … 2407 2515 + 2408 2516 +#endif /* __LINUX_SPINLOCK_H */ 2409 diff -Naur aboot-0.9b.orig/include/linux/spinlock_api_smp.h aboot-0.9b/include/linux/spinlock_api_smp.h2410 --- aboot-0.9b.orig/include/linux/spinlock_api_smp.h 1969-12-31 19:00:00.000000000 -05002411 +++ aboot-0.9b/include/linux/spinlock_api_smp.h 2006-06-25 18:22:04.000000000 -04002412 @@ -0,0 +1,57 @@2413 +#ifndef __LINUX_SPINLOCK_API_SMP_H2414 +#define __LINUX_SPINLOCK_API_SMP_H2415 +2416 +#ifndef __LINUX_SPINLOCK_H2417 +# error "please don't include this file directly"2418 +#endif2419 +2420 +/*2421 + * include/linux/spinlock_api_smp.h2422 + *2423 + * spinlock API declarations on SMP (and debug)2424 + * (implemented in kernel/spinlock.c)2425 + *2426 + * portions Copyright 2005, Red Hat, Inc., Ingo Molnar2427 + * Released under the General Public License (GPL).2428 + */2429 +2430 +int in_lock_functions(unsigned long addr);2431 +2432 +#define assert_spin_locked(x) BUG_ON(!spin_is_locked(x))2433 +2434 +void __lockfunc _spin_lock(spinlock_t *lock) __acquires(spinlock_t);2435 +void __lockfunc _read_lock(rwlock_t *lock) __acquires(rwlock_t);2436 +void __lockfunc _write_lock(rwlock_t *lock) __acquires(rwlock_t);2437 +void __lockfunc _spin_lock_bh(spinlock_t *lock) __acquires(spinlock_t);2438 +void __lockfunc _read_lock_bh(rwlock_t *lock) __acquires(rwlock_t);2439 +void __lockfunc _write_lock_bh(rwlock_t *lock) __acquires(rwlock_t);2440 +void __lockfunc _spin_lock_irq(spinlock_t *lock) __acquires(spinlock_t);2441 +void __lockfunc _read_lock_irq(rwlock_t *lock) __acquires(rwlock_t);2442 +void __lockfunc _write_lock_irq(rwlock_t *lock) __acquires(rwlock_t);2443 +unsigned long __lockfunc _spin_lock_irqsave(spinlock_t *lock)2444 + __acquires(spinlock_t);2445 +unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)2446 + __acquires(rwlock_t);2447 +unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock)2448 + __acquires(rwlock_t);2449 +int __lockfunc _spin_trylock(spinlock_t *lock);2450 +int __lockfunc _read_trylock(rwlock_t *lock);2451 +int __lockfunc _write_trylock(rwlock_t *lock);2452 +int __lockfunc _spin_trylock_bh(spinlock_t *lock);2453 +void __lockfunc _spin_unlock(spinlock_t *lock) __releases(spinlock_t);2454 +void __lockfunc _read_unlock(rwlock_t *lock) __releases(rwlock_t);2455 +void __lockfunc _write_unlock(rwlock_t *lock) __releases(rwlock_t);2456 +void __lockfunc _spin_unlock_bh(spinlock_t *lock) __releases(spinlock_t);2457 +void __lockfunc _read_unlock_bh(rwlock_t *lock) __releases(rwlock_t);2458 +void __lockfunc _write_unlock_bh(rwlock_t *lock) __releases(rwlock_t);2459 +void __lockfunc _spin_unlock_irq(spinlock_t *lock) __releases(spinlock_t);2460 +void __lockfunc _read_unlock_irq(rwlock_t *lock) __releases(rwlock_t);2461 +void __lockfunc _write_unlock_irq(rwlock_t *lock) __releases(rwlock_t);2462 +void __lockfunc _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags)2463 + __releases(spinlock_t);2464 +void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)2465 + __releases(rwlock_t);2466 +void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)2467 + __releases(rwlock_t);2468 +2469 +#endif /* __LINUX_SPINLOCK_API_SMP_H */2470 diff -Naur aboot-0.9b.orig/include/linux/spinlock_api_up.h aboot-0.9b/include/linux/spinlock_api_up.h2471 --- aboot-0.9b.orig/include/linux/spinlock_api_up.h 1969-12-31 19:00:00.000000000 -05002472 +++ aboot-0.9b/include/linux/spinlock_api_up.h 2006-06-25 18:22:04.000000000 -04002473 @@ -0,0 +1,80 @@2474 +#ifndef __LINUX_SPINLOCK_API_UP_H2475 +#define __LINUX_SPINLOCK_API_UP_H2476 +2477 +#ifndef __LINUX_SPINLOCK_H2478 +# error "please don't include this file directly"2479 +#endif2480 +2481 +/*2482 + * include/linux/spinlock_api_up.h2483 + *2484 + * spinlock API implementation on UP-nondebug (inlined implementation)2485 + *2486 + * portions Copyright 2005, Red Hat, Inc., Ingo Molnar2487 + * Released under the General Public License (GPL).2488 + */2489 +2490 +#define in_lock_functions(ADDR) 02491 +2492 +#define assert_spin_locked(lock) do { (void)(lock); } while (0)2493 +2494 +/*2495 + * In the UP-nondebug case there's no real locking going on, so the2496 + * only thing we have to do is to keep the preempt counts and irq2497 + * flags straight, to supress compiler warnings of unused lock2498 + * variables, and to add the proper checker annotations:2499 + */2500 +#define __LOCK(lock) \2501 + do { preempt_disable(); __acquire(lock); (void)(lock); } while (0)2502 +2503 +#define __LOCK_BH(lock) \2504 + do { local_bh_disable(); __LOCK(lock); } while (0)2505 +2506 +#define __LOCK_IRQ(lock) \2507 + do { local_irq_disable(); __LOCK(lock); } while (0)2508 +2509 +#define __LOCK_IRQSAVE(lock, flags) \2510 + do { local_irq_save(flags); __LOCK(lock); } while (0)2511 +2512 +#define __UNLOCK(lock) \2513 + do { preempt_enable(); __release(lock); (void)(lock); } while (0)2514 +2515 +#define __UNLOCK_BH(lock) \2516 + do { preempt_enable_no_resched(); local_bh_enable(); __release(lock); (void)(lock); } while (0)2517 +2518 +#define __UNLOCK_IRQ(lock) \2519 + do { local_irq_enable(); __UNLOCK(lock); } while (0)2520 +2521 +#define __UNLOCK_IRQRESTORE(lock, flags) \2522 + do { local_irq_restore(flags); __UNLOCK(lock); } while (0)2523 +2524 +#define _spin_lock(lock) __LOCK(lock)2525 +#define _read_lock(lock) __LOCK(lock)2526 +#define _write_lock(lock) __LOCK(lock)2527 +#define _spin_lock_bh(lock) __LOCK_BH(lock)2528 +#define _read_lock_bh(lock) __LOCK_BH(lock)2529 +#define _write_lock_bh(lock) __LOCK_BH(lock)2530 +#define _spin_lock_irq(lock) __LOCK_IRQ(lock)2531 +#define _read_lock_irq(lock) __LOCK_IRQ(lock)2532 +#define _write_lock_irq(lock) __LOCK_IRQ(lock)2533 +#define _spin_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags)2534 +#define _read_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags)2535 +#define _write_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags)2536 +#define _spin_trylock(lock) ({ __LOCK(lock); 1; })2537 +#define _read_trylock(lock) ({ __LOCK(lock); 1; })2538 +#define _write_trylock(lock) ({ __LOCK(lock); 1; })2539 +#define _spin_trylock_bh(lock) ({ __LOCK_BH(lock); 1; })2540 +#define _spin_unlock(lock) __UNLOCK(lock)2541 +#define _read_unlock(lock) __UNLOCK(lock)2542 +#define _write_unlock(lock) __UNLOCK(lock)2543 +#define _spin_unlock_bh(lock) __UNLOCK_BH(lock)2544 +#define _write_unlock_bh(lock) __UNLOCK_BH(lock)2545 +#define _read_unlock_bh(lock) __UNLOCK_BH(lock)2546 +#define _spin_unlock_irq(lock) __UNLOCK_IRQ(lock)2547 +#define _read_unlock_irq(lock) __UNLOCK_IRQ(lock)2548 +#define _write_unlock_irq(lock) __UNLOCK_IRQ(lock)2549 +#define _spin_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags)2550 +#define _read_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags)2551 +#define _write_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags)2552 +2553 +#endif /* __LINUX_SPINLOCK_API_UP_H */2554 2517 diff -Naur aboot-0.9b.orig/include/linux/spinlock_types.h aboot-0.9b/include/linux/spinlock_types.h 2555 2518 --- aboot-0.9b.orig/include/linux/spinlock_types.h 1969-12-31 19:00:00.000000000 -0500 2556 +++ aboot-0.9b/include/linux/spinlock_types.h 2006-06-2 5 18:22:04.000000000 -04002519 +++ aboot-0.9b/include/linux/spinlock_types.h 2006-06-27 22:02:47.000000000 -0400 2557 2520 @@ -0,0 +1,67 @@ 2558 2521 +#ifndef __LINUX_SPINLOCK_TYPES_H … … 2625 2588 diff -Naur aboot-0.9b.orig/include/linux/spinlock_types_up.h aboot-0.9b/include/linux/spinlock_types_up.h 2626 2589 --- aboot-0.9b.orig/include/linux/spinlock_types_up.h 1969-12-31 19:00:00.000000000 -0500 2627 +++ aboot-0.9b/include/linux/spinlock_types_up.h 2006-06-2 5 18:22:04.000000000 -04002590 +++ aboot-0.9b/include/linux/spinlock_types_up.h 2006-06-27 22:02:47.000000000 -0400 2628 2591 @@ -0,0 +1,37 @@ 2629 2592 +#ifndef __LINUX_SPINLOCK_TYPES_UP_H … … 2666 2629 diff -Naur aboot-0.9b.orig/include/linux/spinlock_up.h aboot-0.9b/include/linux/spinlock_up.h 2667 2630 --- aboot-0.9b.orig/include/linux/spinlock_up.h 1969-12-31 19:00:00.000000000 -0500 2668 +++ aboot-0.9b/include/linux/spinlock_up.h 2006-06-2 5 18:22:04.000000000 -04002631 +++ aboot-0.9b/include/linux/spinlock_up.h 2006-06-27 22:02:47.000000000 -0400 2669 2632 @@ -0,0 +1,74 @@ 2670 2633 +#ifndef __LINUX_SPINLOCK_UP_H … … 2744 2707 diff -Naur aboot-0.9b.orig/include/linux/stat.h aboot-0.9b/include/linux/stat.h 2745 2708 --- aboot-0.9b.orig/include/linux/stat.h 1969-12-31 19:00:00.000000000 -0500 2746 +++ aboot-0.9b/include/linux/stat.h 2006-06-2 5 18:22:04.000000000 -04002709 +++ aboot-0.9b/include/linux/stat.h 2006-06-27 22:02:47.000000000 -0400 2747 2710 @@ -0,0 +1,77 @@ 2748 2711 +#ifndef _LINUX_STAT_H … … 2825 2788 diff -Naur aboot-0.9b.orig/include/linux/string.h aboot-0.9b/include/linux/string.h 2826 2789 --- aboot-0.9b.orig/include/linux/string.h 1969-12-31 19:00:00.000000000 -0500 2827 +++ aboot-0.9b/include/linux/string.h 2006-06-2 5 18:22:04.000000000 -04002790 +++ aboot-0.9b/include/linux/string.h 2006-06-27 22:02:47.000000000 -0400 2828 2791 @@ -0,0 +1,100 @@ 2829 2792 +#ifndef _LINUX_STRING_H_ … … 2929 2892 diff -Naur aboot-0.9b.orig/include/linux/thread_info.h aboot-0.9b/include/linux/thread_info.h 2930 2893 --- aboot-0.9b.orig/include/linux/thread_info.h 1969-12-31 19:00:00.000000000 -0500 2931 +++ aboot-0.9b/include/linux/thread_info.h 2006-06-2 5 18:22:04.000000000 -04002894 +++ aboot-0.9b/include/linux/thread_info.h 2006-06-27 22:02:47.000000000 -0400 2932 2895 @@ -0,0 +1,71 @@ 2933 2896 +/* thread_info.h: common low-level thread information accessors … … 3003 2966 +#endif /* _LINUX_THREAD_INFO_H */ 3004 2967 diff -Naur aboot-0.9b.orig/lib/isolib.c aboot-0.9b/lib/isolib.c 3005 --- aboot-0.9b.orig/lib/isolib.c 200 1-10-08 19:03:53.000000000 -04003006 +++ aboot-0.9b/lib/isolib.c 2006-06-2 5 18:22:04.000000000 -04002968 --- aboot-0.9b.orig/lib/isolib.c 2006-06-27 22:01:25.000000000 -0400 2969 +++ aboot-0.9b/lib/isolib.c 2006-06-27 22:02:47.000000000 -0400 3007 2970 @@ -6,6 +6,7 @@ 3008 2971 * functionality to the Linux bootstrapper. All we can do is … … 3021 2984 slen -= slp->len + 2; 3022 2985 oldslp = slp; 2986 diff -Naur aboot-0.9b.orig/Makefile aboot-0.9b/Makefile 2987 --- aboot-0.9b.orig/Makefile 2006-06-27 22:01:25.000000000 -0400 2988 +++ aboot-0.9b/Makefile 2006-06-27 22:02:47.000000000 -0400 2989 @@ -23,7 +23,7 @@ 2990 root = 2991 bindir = $(root)/sbin 2992 bootdir = $(root)/boot 2993 -mandir = /usr/man 2994 +mandir = $(root)/usr/man 2995 2996 # 2997 # There shouldn't be any need to change anything below this line. 2998 @@ -82,10 +82,10 @@ 2999 tools/objstrip -vb aboot bootlx 3000 3001 install-man: 3002 - make -C doc/man install 3003 + $(MAKE) -C doc/man install 3004 3005 install-man-gz: 3006 - make -C doc/man install-gz 3007 + $(MAKE) -C doc/man install-gz 3008 3009 install: tools/abootconf tools/e2writeboot tools/isomarkboot \ 3010 sdisklabel/swriteboot install-man 3011 @@ -128,13 +128,13 @@ 3012 find . -name \*~ | xargs rm -f 3013 3014 lib/%: 3015 - make -C lib $* CPPFLAGS="$(CPPFLAGS)" TESTING="$(TESTING)" 3016 + $(MAKE) -C lib $* CPPFLAGS="$(CPPFLAGS)" TESTING="$(TESTING)" 3017 3018 tools/%: 3019 - make -C tools $* CPPFLAGS="$(CPPFLAGS)" 3020 + $(MAKE) -C tools $* CPPFLAGS="$(CPPFLAGS)" 3021 3022 sdisklabel/%: 3023 - make -C sdisklabel $* CPPFLAGS="$(CPPFLAGS)" 3024 + $(MAKE) -C sdisklabel $* CPPFLAGS="$(CPPFLAGS)" 3025 3026 vmlinux.nh: $(VMLINUX) tools/objstrip 3027 tools/objstrip -vb $(VMLINUX) vmlinux.nh 3023 3028 diff -Naur aboot-0.9b.orig/sdisklabel/Makefile aboot-0.9b/sdisklabel/Makefile 3024 --- aboot-0.9b.orig/sdisklabel/Makefile 200 1-10-08 19:03:53.000000000 -04003025 +++ aboot-0.9b/sdisklabel/Makefile 2006-06-2 5 18:22:04.000000000 -04003029 --- aboot-0.9b.orig/sdisklabel/Makefile 2006-06-27 22:01:25.000000000 -0400 3030 +++ aboot-0.9b/sdisklabel/Makefile 2006-06-27 22:02:47.000000000 -0400 3026 3031 @@ -1,13 +1,16 @@ 3027 3032 -CC = gcc -O2 … … 3045 3050 rm -f sdisklabel swriteboot *.o 3046 3051 diff -Naur aboot-0.9b.orig/tools/Makefile aboot-0.9b/tools/Makefile 3047 --- aboot-0.9b.orig/tools/Makefile 200 1-10-08 19:03:53.000000000 -04003048 +++ aboot-0.9b/tools/Makefile 2006-06-2 5 18:22:04.000000000 -04003052 --- aboot-0.9b.orig/tools/Makefile 2006-06-27 22:01:25.000000000 -0400 3053 +++ aboot-0.9b/tools/Makefile 2006-06-27 22:02:47.000000000 -0400 3049 3054 @@ -1,20 +1,32 @@ 3050 3055 -CC = gcc … … 3090 3095 diff -Naur aboot-0.9b.orig/tools/Makefile.orig aboot-0.9b/tools/Makefile.orig 3091 3096 --- aboot-0.9b.orig/tools/Makefile.orig 1969-12-31 19:00:00.000000000 -0500 3092 +++ aboot-0.9b/tools/Makefile.orig 2006-06-2 5 18:22:04.000000000 -04003097 +++ aboot-0.9b/tools/Makefile.orig 2006-06-27 22:02:47.000000000 -0400 3093 3098 @@ -0,0 +1,20 @@ 3094 3099 +CC = gcc … … 3113 3118 +e2lib.o: e2lib.h 3114 3119 diff -Naur aboot-0.9b.orig/tools/objstrip.c aboot-0.9b/tools/objstrip.c 3115 --- aboot-0.9b.orig/tools/objstrip.c 200 2-09-18 15:48:22.000000000 -04003116 +++ aboot-0.9b/tools/objstrip.c 2006-06-2 5 18:22:04.000000000 -04003120 --- aboot-0.9b.orig/tools/objstrip.c 2006-06-27 22:01:25.000000000 -0400 3121 +++ aboot-0.9b/tools/objstrip.c 2006-06-27 22:02:47.000000000 -0400 3117 3122 @@ -7,15 +7,17 @@ 3118 3123 */
Note:
See TracChangeset
for help on using the changeset viewer.