Changeset 6742797


Ignore:
Timestamp:
Jun 28, 2006, 5:56:55 PM (19 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
6c32364
Parents:
aaecc3ab
Message:

Added aboot-0.9b-kernel26_gcc4_fixes-4.patch

File:
1 moved

Legend:

Unmodified
Added
Removed

  • patches/aboot-0.9b-kernel26_gcc4_fixes-4.patch

    raaecc3ab r6742797  
    1010        system.
    1111
    12 diff -Naur aboot-0.9b.orig/Makefile aboot-0.9b/Makefile
    13 --- aboot-0.9b.orig/Makefile    2002-09-18 15:48:21.000000000 -0400
    14 +++ aboot-0.9b/Makefile 2006-06-25 18:22:04.000000000 -0400
    15 @@ -23,7 +23,7 @@
    16  root           =
    17  bindir         = $(root)/sbin
    18  bootdir                = $(root)/boot
    19 -mandir         = /usr/man
    20 +mandir         = $(root)/usr/man
    21  
    22  #
    23  # There shouldn't be any need to change anything below this line.
    24 @@ -82,10 +82,10 @@
    25         tools/objstrip -vb aboot bootlx
    26  
    27  install-man:
    28 -       make -C doc/man install
    29 +       $(MAKE) -C doc/man install
    30  
    31  install-man-gz:
    32 -       make -C doc/man install-gz
    33 +       $(MAKE) -C doc/man install-gz
    34  
    35  install: tools/abootconf tools/e2writeboot tools/isomarkboot \
    36         sdisklabel/swriteboot install-man
    37 @@ -128,13 +128,13 @@
    38         find . -name \*~ | xargs rm -f
    39  
    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/objstrip
    53         tools/objstrip -vb $(VMLINUX) vmlinux.nh
    5412diff -Naur aboot-0.9b.orig/cons.c aboot-0.9b/cons.c
    55 --- aboot-0.9b.orig/cons.c      2001-10-08 19:03:50.000000000 -0400
    56 +++ aboot-0.9b/cons.c   2006-06-25 18:22:04.000000000 -0400
     13--- 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
    5715@@ -12,7 +12,7 @@
    5816 #include <utils.h>
    … …  
    6523 cons_puts(const char *str, long len)
    6624diff -Naur aboot-0.9b.orig/disk.c aboot-0.9b/disk.c
    67 --- aboot-0.9b.orig/disk.c      2001-10-09 16:45:57.000000000 -0400
    68 +++ aboot-0.9b/disk.c   2006-06-25 18:22:04.000000000 -0400
     25--- 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
    6927@@ -480,9 +480,7 @@
    7028                                } else {
    … …  
    7937                }
    8038diff -Naur aboot-0.9b.orig/doc/man/Makefile aboot-0.9b/doc/man/Makefile
    81 --- aboot-0.9b.orig/doc/man/Makefile    2003-01-14 15:12:14.000000000 -0500
    82 +++ aboot-0.9b/doc/man/Makefile 2006-06-25 18:22:04.000000000 -0400
     39--- 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
    8341@@ -6,7 +6,7 @@
    8442 # use that value. Otherwise default to /usr/man.
    … …  
    9250diff -Naur aboot-0.9b.orig/include/asm/a.out.h aboot-0.9b/include/asm/a.out.h
    9351--- 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-25 18:22:04.000000000 -0400
     52+++ aboot-0.9b/include/asm/a.out.h      2006-06-27 22:02:47.000000000 -0400
    9553@@ -0,0 +1,91 @@
    9654+#ifndef __ALPHA_A_OUT_H__
    … …  
    187145diff -Naur aboot-0.9b.orig/include/asm/auxvec.h aboot-0.9b/include/asm/auxvec.h
    188146--- 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-25 18:22:04.000000000 -0400
     147+++ aboot-0.9b/include/asm/auxvec.h     2006-06-27 22:02:47.000000000 -0400
    190148@@ -0,0 +1,24 @@
    191149+#ifndef __ASM_ALPHA_AUXVEC_H
    … …  
    215173diff -Naur aboot-0.9b.orig/include/asm/barrier.h aboot-0.9b/include/asm/barrier.h
    216174--- 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-25 18:22:04.000000000 -0400
     175+++ aboot-0.9b/include/asm/barrier.h    2006-06-27 22:02:47.000000000 -0400
    218176@@ -0,0 +1,34 @@
    219177+#ifndef __BARRIER_H
    … …  
    253211diff -Naur aboot-0.9b.orig/include/asm/hwrpb.h aboot-0.9b/include/asm/hwrpb.h
    254212--- 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-25 18:22:04.000000000 -0400
     213+++ aboot-0.9b/include/asm/hwrpb.h      2006-06-27 22:02:47.000000000 -0400
    256214@@ -0,0 +1,205 @@
    257215+#ifndef __ALPHA_HWRPB_H
    … …  
    462420diff -Naur aboot-0.9b.orig/include/asm/page.h aboot-0.9b/include/asm/page.h
    463421--- 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-25 18:22:04.000000000 -0400
     422+++ aboot-0.9b/include/asm/page.h       2006-06-27 22:02:47.000000000 -0400
    465423@@ -0,0 +1,103 @@
    466424+#ifndef _ALPHA_PAGE_H
    … …  
    569527diff -Naur aboot-0.9b.orig/include/asm/pal.h aboot-0.9b/include/asm/pal.h
    570528--- 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-25 18:22:04.000000000 -0400
     529+++ aboot-0.9b/include/asm/pal.h        2006-06-27 22:02:47.000000000 -0400
    572530@@ -0,0 +1,51 @@
    573531+#ifndef __ALPHA_PAL_H
    … …  
    624582diff -Naur aboot-0.9b.orig/include/asm/spinlock.h aboot-0.9b/include/asm/spinlock.h
    625583--- 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-25 18:22:04.000000000 -0400
     584+++ aboot-0.9b/include/asm/spinlock.h   2006-06-27 22:02:47.000000000 -0400
    627585@@ -0,0 +1,170 @@
    628586+#ifndef _ALPHA_SPINLOCK_H
    … …  
    798756diff -Naur aboot-0.9b.orig/include/asm/spinlock_types.h aboot-0.9b/include/asm/spinlock_types.h
    799757--- 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-25 18:22:04.000000000 -0400
     758+++ aboot-0.9b/include/asm/spinlock_types.h     2006-06-27 22:02:47.000000000 -0400
    801759@@ -0,0 +1,20 @@
    802760+#ifndef _ALPHA_SPINLOCK_TYPES_H
    … …  
    822780diff -Naur aboot-0.9b.orig/include/asm/string.h aboot-0.9b/include/asm/string.h
    823781--- 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-25 18:22:04.000000000 -0400
     782+++ aboot-0.9b/include/asm/string.h     2006-06-27 22:02:47.000000000 -0400
    825783@@ -0,0 +1,68 @@
    826784+#ifndef __ALPHA_STRING_H__
    … …  
    894852diff -Naur aboot-0.9b.orig/include/asm/system.h aboot-0.9b/include/asm/system.h
    895853--- 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-25 18:22:04.000000000 -0400
     854+++ aboot-0.9b/include/asm/system.h     2006-06-27 22:02:47.000000000 -0400
    897855@@ -0,0 +1,594 @@
    898856+#ifndef __ALPHA_SYSTEM_H
    … …  
    14921450diff -Naur aboot-0.9b.orig/include/asm/thread_info.h aboot-0.9b/include/asm/thread_info.h
    14931451--- 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-25 18:22:04.000000000 -0400
     1452+++ aboot-0.9b/include/asm/thread_info.h        2006-06-27 22:02:47.000000000 -0400
    14951453@@ -0,0 +1,96 @@
    14961454+#ifndef _ALPHA_THREAD_INFO_H
    … …  
    15901548+#endif /* __KERNEL__ */
    15911549+#endif /* _ALPHA_THREAD_INFO_H */
     1550diff -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 */
    15921555diff -Naur aboot-0.9b.orig/include/asm-generic/page.h aboot-0.9b/include/asm-generic/page.h
    15931556--- 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-25 18:22:04.000000000 -0400
     1557+++ aboot-0.9b/include/asm-generic/page.h       2006-06-27 22:02:47.000000000 -0400
    15951558@@ -0,0 +1,27 @@
    15961559+#ifndef _ASM_GENERIC_PAGE_H
    … …  
    16231586diff -Naur aboot-0.9b.orig/include/linux/auxvec.h aboot-0.9b/include/linux/auxvec.h
    16241587--- 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-25 18:22:04.000000000 -0400
     1588+++ aboot-0.9b/include/linux/auxvec.h   2006-06-27 22:02:47.000000000 -0400
    16261589@@ -0,0 +1,31 @@
    16271590+#ifndef _LINUX_AUXVEC_H
    … …  
    16581621diff -Naur aboot-0.9b.orig/include/linux/blockgroup_lock.h aboot-0.9b/include/linux/blockgroup_lock.h
    16591622--- 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-25 18:22:04.000000000 -0400
     1623+++ aboot-0.9b/include/linux/blockgroup_lock.h  2006-06-27 22:02:47.000000000 -0400
    16611624@@ -0,0 +1,60 @@
    16621625+#ifndef _LINUX_BLOCKGROUP_LOCK_H
    … …  
    17221685diff -Naur aboot-0.9b.orig/include/linux/config.h aboot-0.9b/include/linux/config.h
    17231686--- 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-25 18:22:38.000000000 -0400
     1687+++ aboot-0.9b/include/linux/config.h   2006-06-27 22:02:47.000000000 -0400
    17251688@@ -0,0 +1 @@
    17261689+/* Dummy Config.h */
    17271690diff -Naur aboot-0.9b.orig/include/linux/elf.h aboot-0.9b/include/linux/elf.h
    17281691--- 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-25 18:22:04.000000000 -0400
     1692+++ aboot-0.9b/include/linux/elf.h      2006-06-27 22:02:47.000000000 -0400
    17301693@@ -0,0 +1,427 @@
    17311694+#ifndef _LINUX_ELF_H
    … …  
    21562119+
    21572120+#endif /* _LINUX_ELF_H */
     2121diff -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 */
     2182diff -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 */
    21582266diff -Naur aboot-0.9b.orig/include/linux/spinlock.h aboot-0.9b/include/linux/spinlock.h
    21592267--- 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-25 18:22:04.000000000 -0400
     2268+++ aboot-0.9b/include/linux/spinlock.h 2006-06-27 22:02:47.000000000 -0400
    21612269@@ -0,0 +1,247 @@
    21622270+#ifndef __LINUX_SPINLOCK_H
    … …  
    24072515+
    24082516+#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.h
    2410 --- aboot-0.9b.orig/include/linux/spinlock_api_smp.h    1969-12-31 19:00:00.000000000 -0500
    2411 +++ aboot-0.9b/include/linux/spinlock_api_smp.h 2006-06-25 18:22:04.000000000 -0400
    2412 @@ -0,0 +1,57 @@
    2413 +#ifndef __LINUX_SPINLOCK_API_SMP_H
    2414 +#define __LINUX_SPINLOCK_API_SMP_H
    2415 +
    2416 +#ifndef __LINUX_SPINLOCK_H
    2417 +# error "please don't include this file directly"
    2418 +#endif
    2419 +
    2420 +/*
    2421 + * include/linux/spinlock_api_smp.h
    2422 + *
    2423 + * spinlock API declarations on SMP (and debug)
    2424 + * (implemented in kernel/spinlock.c)
    2425 + *
    2426 + * portions Copyright 2005, Red Hat, Inc., Ingo Molnar
    2427 + * 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.h
    2471 --- aboot-0.9b.orig/include/linux/spinlock_api_up.h     1969-12-31 19:00:00.000000000 -0500
    2472 +++ aboot-0.9b/include/linux/spinlock_api_up.h  2006-06-25 18:22:04.000000000 -0400
    2473 @@ -0,0 +1,80 @@
    2474 +#ifndef __LINUX_SPINLOCK_API_UP_H
    2475 +#define __LINUX_SPINLOCK_API_UP_H
    2476 +
    2477 +#ifndef __LINUX_SPINLOCK_H
    2478 +# error "please don't include this file directly"
    2479 +#endif
    2480 +
    2481 +/*
    2482 + * include/linux/spinlock_api_up.h
    2483 + *
    2484 + * spinlock API implementation on UP-nondebug (inlined implementation)
    2485 + *
    2486 + * portions Copyright 2005, Red Hat, Inc., Ingo Molnar
    2487 + * Released under the General Public License (GPL).
    2488 + */
    2489 +
    2490 +#define in_lock_functions(ADDR)                0
    2491 +
    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 the
    2496 + * only thing we have to do is to keep the preempt counts and irq
    2497 + * flags straight, to supress compiler warnings of unused lock
    2498 + * 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 */
    25542517diff -Naur aboot-0.9b.orig/include/linux/spinlock_types.h aboot-0.9b/include/linux/spinlock_types.h
    25552518--- 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-25 18:22:04.000000000 -0400
     2519+++ aboot-0.9b/include/linux/spinlock_types.h   2006-06-27 22:02:47.000000000 -0400
    25572520@@ -0,0 +1,67 @@
    25582521+#ifndef __LINUX_SPINLOCK_TYPES_H
    … …  
    26252588diff -Naur aboot-0.9b.orig/include/linux/spinlock_types_up.h aboot-0.9b/include/linux/spinlock_types_up.h
    26262589--- 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-25 18:22:04.000000000 -0400
     2590+++ aboot-0.9b/include/linux/spinlock_types_up.h        2006-06-27 22:02:47.000000000 -0400
    26282591@@ -0,0 +1,37 @@
    26292592+#ifndef __LINUX_SPINLOCK_TYPES_UP_H
    … …  
    26662629diff -Naur aboot-0.9b.orig/include/linux/spinlock_up.h aboot-0.9b/include/linux/spinlock_up.h
    26672630--- 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-25 18:22:04.000000000 -0400
     2631+++ aboot-0.9b/include/linux/spinlock_up.h      2006-06-27 22:02:47.000000000 -0400
    26692632@@ -0,0 +1,74 @@
    26702633+#ifndef __LINUX_SPINLOCK_UP_H
    … …  
    27442707diff -Naur aboot-0.9b.orig/include/linux/stat.h aboot-0.9b/include/linux/stat.h
    27452708--- 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-25 18:22:04.000000000 -0400
     2709+++ aboot-0.9b/include/linux/stat.h     2006-06-27 22:02:47.000000000 -0400
    27472710@@ -0,0 +1,77 @@
    27482711+#ifndef _LINUX_STAT_H
    … …  
    28252788diff -Naur aboot-0.9b.orig/include/linux/string.h aboot-0.9b/include/linux/string.h
    28262789--- 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-25 18:22:04.000000000 -0400
     2790+++ aboot-0.9b/include/linux/string.h   2006-06-27 22:02:47.000000000 -0400
    28282791@@ -0,0 +1,100 @@
    28292792+#ifndef _LINUX_STRING_H_
    … …  
    29292892diff -Naur aboot-0.9b.orig/include/linux/thread_info.h aboot-0.9b/include/linux/thread_info.h
    29302893--- 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-25 18:22:04.000000000 -0400
     2894+++ aboot-0.9b/include/linux/thread_info.h      2006-06-27 22:02:47.000000000 -0400
    29322895@@ -0,0 +1,71 @@
    29332896+/* thread_info.h: common low-level thread information accessors
    … …  
    30032966+#endif /* _LINUX_THREAD_INFO_H */
    30042967diff -Naur aboot-0.9b.orig/lib/isolib.c aboot-0.9b/lib/isolib.c
    3005 --- aboot-0.9b.orig/lib/isolib.c        2001-10-08 19:03:53.000000000 -0400
    3006 +++ aboot-0.9b/lib/isolib.c     2006-06-25 18:22:04.000000000 -0400
     2968--- 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
    30072970@@ -6,6 +6,7 @@
    30082971  * functionality to the Linux bootstrapper.  All we can do is
    … …  
    30212984         slen -= slp->len + 2;
    30222985         oldslp = slp;
     2986diff -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
    30233028diff -Naur aboot-0.9b.orig/sdisklabel/Makefile aboot-0.9b/sdisklabel/Makefile
    3024 --- aboot-0.9b.orig/sdisklabel/Makefile 2001-10-08 19:03:53.000000000 -0400
    3025 +++ aboot-0.9b/sdisklabel/Makefile      2006-06-25 18:22:04.000000000 -0400
     3029--- 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
    30263031@@ -1,13 +1,16 @@
    30273032-CC = gcc -O2
    … …  
    30453050        rm -f sdisklabel swriteboot *.o
    30463051diff -Naur aboot-0.9b.orig/tools/Makefile aboot-0.9b/tools/Makefile
    3047 --- aboot-0.9b.orig/tools/Makefile      2001-10-08 19:03:53.000000000 -0400
    3048 +++ aboot-0.9b/tools/Makefile   2006-06-25 18:22:04.000000000 -0400
     3052--- 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
    30493054@@ -1,20 +1,32 @@
    30503055-CC     = gcc
    … …  
    30903095diff -Naur aboot-0.9b.orig/tools/Makefile.orig aboot-0.9b/tools/Makefile.orig
    30913096--- aboot-0.9b.orig/tools/Makefile.orig 1969-12-31 19:00:00.000000000 -0500
    3092 +++ aboot-0.9b/tools/Makefile.orig      2006-06-25 18:22:04.000000000 -0400
     3097+++ aboot-0.9b/tools/Makefile.orig      2006-06-27 22:02:47.000000000 -0400
    30933098@@ -0,0 +1,20 @@
    30943099+CC     = gcc
    … …  
    31133118+e2lib.o: e2lib.h
    31143119diff -Naur aboot-0.9b.orig/tools/objstrip.c aboot-0.9b/tools/objstrip.c
    3115 --- aboot-0.9b.orig/tools/objstrip.c    2002-09-18 15:48:22.000000000 -0400
    3116 +++ aboot-0.9b/tools/objstrip.c 2006-06-25 18:22:04.000000000 -0400
     3120--- 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
    31173122@@ -7,15 +7,17 @@
    31183123  */
Note: See TracChangeset for help on using the changeset viewer.