[Demudi-commits] r469 - linux-source-2.6.11/trunk/debian/patches
Free Ekanayaka
free-guest@costa.debian.org
Mon, 14 Mar 2005 15:49:02 +0100
Author: free-guest
Date: 2005-03-14 15:48:58 +0100 (Mon, 14 Mar 2005)
New Revision: 469
Modified:
linux-source-2.6.11/trunk/debian/patches/realtime-preempt.dpatch
Log:
New upstream release
Modified: linux-source-2.6.11/trunk/debian/patches/realtime-preempt.dpatch
===================================================================
--- linux-source-2.6.11/trunk/debian/patches/realtime-preempt.dpatch 2005-03-14 09:24:56 UTC (rev 468)
+++ linux-source-2.6.11/trunk/debian/patches/realtime-preempt.dpatch 2005-03-14 14:48:58 UTC (rev 469)
@@ -1,17 +1,21 @@
#! /bin/sh -e
## realtime-prempt.dpatch by free@agnula.org
##
-## All lines beginning with `## DP:' are a description of the patch.
+## All lines beginning with ## DP:' are a description of the patch.
## DP: Description: realtime premption
## DP: Patch author: Ingo Molnar
-## DP: Upstream home: http://people.redhat.com/mingo/realtime-preempt/
+## DP: URL: http://people.redhat.com/mingo/realtime-preempt/realtime-preempt-2.6.11-final-V0.7.40-00
. $(dirname $0)/DPATCH
@DPATCH@
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
--- linux/net/core/pktgen.c.orig
+++ linux/net/core/pktgen.c
-@@ -1690,7 +1690,7 @@ static void pktgen_setup_inject(struct p
+@@ -1675,7 +1675,7 @@ static void pktgen_setup_inject(struct p
struct in_device *in_dev;
@@ -20,7 +24,7 @@
in_dev = __in_dev_get(pkt_dev->odev);
if (in_dev) {
if (in_dev->ifa_list) {
-@@ -1699,7 +1699,7 @@ static void pktgen_setup_inject(struct p
+@@ -1684,7 +1684,7 @@ static void pktgen_setup_inject(struct p
}
in_dev_put(in_dev);
}
@@ -1239,7 +1243,7 @@
EXPORT_SYMBOL(inet_del_protocol);
--- linux/net/ipv4/route.c.orig
+++ linux/net/ipv4/route.c
-@@ -196,7 +196,7 @@ __u8 ip_tos2prio[16] = {
+@@ -197,7 +197,7 @@ __u8 ip_tos2prio[16] = {
struct rt_hash_bucket {
struct rtable *chain;
@@ -1248,7 +1252,7 @@
} __attribute__((__aligned__(8)));
static struct rt_hash_bucket *rt_hash_table;
-@@ -226,11 +226,11 @@ static struct rtable *rt_cache_get_first
+@@ -227,11 +227,11 @@ static struct rtable *rt_cache_get_first
struct rt_cache_iter_state *st = seq->private;
for (st->bucket = rt_hash_mask; st->bucket >= 0; --st->bucket) {
@@ -1262,7 +1266,7 @@
}
return r;
}
-@@ -241,10 +241,10 @@ static struct rtable *rt_cache_get_next(
+@@ -242,10 +242,10 @@ static struct rtable *rt_cache_get_next(
r = r->u.rt_next;
while (!r) {
@@ -1275,7 +1279,7 @@
r = rt_hash_table[st->bucket].chain;
}
return r;
-@@ -279,8 +279,10 @@ static void *rt_cache_seq_next(struct se
+@@ -280,8 +280,10 @@ static void *rt_cache_seq_next(struct se
static void rt_cache_seq_stop(struct seq_file *seq, void *v)
{
@@ -1287,7 +1291,7 @@
}
static int rt_cache_seq_show(struct seq_file *seq, void *v)
-@@ -527,7 +529,7 @@ static void rt_check_expire(unsigned lon
+@@ -528,7 +530,7 @@ static void rt_check_expire(unsigned lon
i = (i + 1) & rt_hash_mask;
rthp = &rt_hash_table[i].chain;
@@ -1296,7 +1300,7 @@
while ((rth = *rthp) != NULL) {
if (rth->u.dst.expires) {
/* Entry is expired even if it is in use */
-@@ -546,7 +548,7 @@ static void rt_check_expire(unsigned lon
+@@ -547,7 +549,7 @@ static void rt_check_expire(unsigned lon
*rthp = rth->u.rt_next;
rt_free(rth);
}
@@ -1305,7 +1309,7 @@
/* Fallback loop breaker. */
if (time_after(jiffies, now))
-@@ -569,11 +571,12 @@ static void rt_run_flush(unsigned long d
+@@ -570,11 +572,12 @@ static void rt_run_flush(unsigned long d
get_random_bytes(&rt_hash_rnd, 4);
for (i = rt_hash_mask; i >= 0; i--) {
@@ -1320,7 +1324,7 @@
for (; rth; rth = next) {
next = rth->u.rt_next;
-@@ -703,7 +706,7 @@ static int rt_garbage_collect(void)
+@@ -704,7 +707,7 @@ static int rt_garbage_collect(void)
k = (k + 1) & rt_hash_mask;
rthp = &rt_hash_table[k].chain;
@@ -1329,7 +1333,7 @@
while ((rth = *rthp) != NULL) {
if (!rt_may_expire(rth, tmo, expire)) {
tmo >>= 1;
-@@ -714,7 +717,7 @@ static int rt_garbage_collect(void)
+@@ -715,7 +718,7 @@ static int rt_garbage_collect(void)
rt_free(rth);
goal--;
}
@@ -1338,7 +1342,7 @@
if (goal <= 0)
break;
}
-@@ -791,7 +794,7 @@ restart:
+@@ -792,7 +795,7 @@ restart:
rthp = &rt_hash_table[hash].chain;
@@ -1347,7 +1351,7 @@
while ((rth = *rthp) != NULL) {
if (compare_keys(&rth->fl, &rt->fl)) {
/* Put it first */
-@@ -812,7 +815,7 @@ restart:
+@@ -813,7 +816,7 @@ restart:
rth->u.dst.__use++;
dst_hold(&rth->u.dst);
rth->u.dst.lastuse = now;
@@ -1356,7 +1360,7 @@
rt_drop(rt);
*rp = rth;
-@@ -853,7 +856,7 @@ restart:
+@@ -854,7 +857,7 @@ restart:
if (rt->rt_type == RTN_UNICAST || rt->fl.iif == 0) {
int err = arp_bind_neighbour(&rt->u.dst);
if (err) {
@@ -1365,7 +1369,7 @@
if (err != -ENOBUFS) {
rt_drop(rt);
-@@ -894,7 +897,7 @@ restart:
+@@ -895,7 +898,7 @@ restart:
}
#endif
rt_hash_table[hash].chain = rt;
@@ -1374,7 +1378,7 @@
*rp = rt;
return 0;
}
-@@ -961,7 +964,7 @@ static void rt_del(unsigned hash, struct
+@@ -962,7 +965,7 @@ static void rt_del(unsigned hash, struct
{
struct rtable **rthp;
@@ -1383,7 +1387,7 @@
ip_rt_put(rt);
for (rthp = &rt_hash_table[hash].chain; *rthp;
rthp = &(*rthp)->u.rt_next)
-@@ -970,7 +973,7 @@ static void rt_del(unsigned hash, struct
+@@ -971,7 +974,7 @@ static void rt_del(unsigned hash, struct
rt_free(rt);
break;
}
@@ -1392,7 +1396,7 @@
}
void ip_rt_redirect(u32 old_gw, u32 daddr, u32 new_gw,
-@@ -1009,7 +1012,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd
+@@ -1010,7 +1013,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd
rthp=&rt_hash_table[hash].chain;
@@ -1401,7 +1405,7 @@
while ((rth = rcu_dereference(*rthp)) != NULL) {
struct rtable *rt;
-@@ -1030,7 +1033,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd
+@@ -1031,7 +1034,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd
break;
dst_hold(&rth->u.dst);
@@ -1410,7 +1414,7 @@
rt = dst_alloc(&ipv4_dst_ops);
if (rt == NULL) {
-@@ -1082,7 +1085,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd
+@@ -1083,7 +1086,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd
ip_rt_put(rt);
goto do_next;
}
@@ -1419,7 +1423,7 @@
do_next:
;
}
-@@ -1263,7 +1266,7 @@ unsigned short ip_rt_frag_needed(struct
+@@ -1264,7 +1267,7 @@ unsigned short ip_rt_frag_needed(struct
for (i = 0; i < 2; i++) {
unsigned hash = rt_hash_code(daddr, skeys[i], tos);
@@ -1428,7 +1432,7 @@
for (rth = rcu_dereference(rt_hash_table[hash].chain); rth;
rth = rcu_dereference(rth->u.rt_next)) {
if (rth->fl.fl4_dst == daddr &&
-@@ -1301,7 +1304,7 @@ unsigned short ip_rt_frag_needed(struct
+@@ -1302,7 +1305,7 @@ unsigned short ip_rt_frag_needed(struct
}
}
}
@@ -1437,7 +1441,7 @@
}
return est_mtu ? : new_mtu;
}
-@@ -1823,7 +1826,7 @@ int ip_route_input(struct sk_buff *skb,
+@@ -1825,7 +1828,7 @@ int ip_route_input(struct sk_buff *skb,
tos &= IPTOS_RT_MASK;
hash = rt_hash_code(daddr, saddr ^ (iif << 5), tos);
@@ -1446,7 +1450,7 @@
for (rth = rcu_dereference(rt_hash_table[hash].chain); rth;
rth = rcu_dereference(rth->u.rt_next)) {
if (rth->fl.fl4_dst == daddr &&
-@@ -1838,13 +1841,13 @@ int ip_route_input(struct sk_buff *skb,
+@@ -1840,13 +1843,13 @@ int ip_route_input(struct sk_buff *skb,
dst_hold(&rth->u.dst);
rth->u.dst.__use++;
RT_CACHE_STAT_INC(in_hit);
@@ -1462,7 +1466,7 @@
/* Multicast recognition logic is moved from route cache to here.
The problem was that too many Ethernet cards have broken/missing
-@@ -1860,7 +1863,7 @@ int ip_route_input(struct sk_buff *skb,
+@@ -1862,7 +1865,7 @@ int ip_route_input(struct sk_buff *skb,
if (MULTICAST(daddr)) {
struct in_device *in_dev;
@@ -1471,7 +1475,7 @@
if ((in_dev = __in_dev_get(dev)) != NULL) {
int our = ip_check_mc(in_dev, daddr, saddr,
skb->nh.iph->protocol);
-@@ -1869,12 +1872,12 @@ int ip_route_input(struct sk_buff *skb,
+@@ -1871,12 +1874,12 @@ int ip_route_input(struct sk_buff *skb,
|| (!LOCAL_MCAST(daddr) && IN_DEV_MFORWARD(in_dev))
#endif
) {
@@ -1486,7 +1490,7 @@
return -EINVAL;
}
return ip_route_input_slow(skb, daddr, saddr, tos, dev);
-@@ -2184,7 +2187,7 @@ int __ip_route_output_key(struct rtable
+@@ -2186,7 +2189,7 @@ int __ip_route_output_key(struct rtable
hash = rt_hash_code(flp->fl4_dst, flp->fl4_src ^ (flp->oif << 5), flp->fl4_tos);
@@ -1495,7 +1499,7 @@
for (rth = rcu_dereference(rt_hash_table[hash].chain); rth;
rth = rcu_dereference(rth->u.rt_next)) {
if (rth->fl.fl4_dst == flp->fl4_dst &&
-@@ -2200,13 +2203,13 @@ int __ip_route_output_key(struct rtable
+@@ -2202,13 +2205,13 @@ int __ip_route_output_key(struct rtable
dst_hold(&rth->u.dst);
rth->u.dst.__use++;
RT_CACHE_STAT_INC(out_hit);
@@ -1511,7 +1515,7 @@
return ip_route_output_slow(rp, flp);
}
-@@ -2421,7 +2424,7 @@ int ip_rt_dump(struct sk_buff *skb, str
+@@ -2423,7 +2426,7 @@ int ip_rt_dump(struct sk_buff *skb, str
if (h < s_h) continue;
if (h > s_h)
s_idx = 0;
@@ -1520,7 +1524,7 @@
for (rt = rcu_dereference(rt_hash_table[h].chain), idx = 0; rt;
rt = rcu_dereference(rt->u.rt_next), idx++) {
if (idx < s_idx)
-@@ -2431,12 +2434,12 @@ int ip_rt_dump(struct sk_buff *skb, str
+@@ -2433,12 +2436,12 @@ int ip_rt_dump(struct sk_buff *skb, str
cb->nlh->nlmsg_seq,
RTM_NEWROUTE, 1) <= 0) {
dst_release(xchg(&skb->dst, NULL));
@@ -1535,7 +1539,7 @@
}
done:
-@@ -2766,7 +2769,7 @@ int __init ip_rt_init(void)
+@@ -2768,7 +2771,7 @@ int __init ip_rt_init(void)
rt_hash_mask--;
for (i = 0; i <= rt_hash_mask; i++) {
@@ -2364,7 +2368,7 @@
return ret;
}
-@@ -334,8 +340,14 @@ out:
+@@ -340,8 +346,14 @@ out:
wake_up_interruptible(PIPE_WAIT(*inode));
kill_fasync(PIPE_FASYNC_READERS(*inode), SIGIO, POLL_IN);
}
@@ -3191,7 +3195,7 @@
--- linux/mm/memory.c.orig
+++ linux/mm/memory.c
-@@ -102,7 +102,7 @@ static inline void clear_pmd_range(struc
+@@ -103,7 +103,7 @@ static inline void clear_pmd_range(struc
page = pmd_page(*pmd);
pmd_clear(pmd);
dec_page_state(nr_page_table_pages);
@@ -3200,7 +3204,7 @@
pte_free_tlb(tlb, page);
}
}
-@@ -176,7 +176,7 @@ static inline void clear_pgd_range(struc
+@@ -179,7 +179,7 @@ static inline void clear_pgd_range(struc
void clear_page_range(struct mmu_gather *tlb, unsigned long start, unsigned long end)
{
unsigned long addr = start, next;
@@ -3209,7 +3213,7 @@
unsigned long i;
for (i = pgd_index(start); i <= pgd_index(end-1); i++) {
-@@ -510,10 +510,10 @@ static void zap_pte_range(struct mmu_gat
+@@ -513,10 +513,10 @@ static void zap_pte_range(struct mmu_gat
if (pte_dirty(pte))
set_page_dirty(page);
if (PageAnon(page))
@@ -7498,7 +7502,7 @@
void destroy_workqueue(struct workqueue_struct *wq)
{
int cpu;
-@@ -515,6 +550,7 @@ void init_workqueues(void)
+@@ -517,6 +552,7 @@ void init_workqueues(void)
hotcpu_notifier(workqueue_cpu_callback, 0);
keventd_wq = create_workqueue("events");
BUG_ON(!keventd_wq);
@@ -10352,7 +10356,7 @@
+
--- linux/kernel/futex.c.orig
+++ linux/kernel/futex.c
-@@ -539,8 +539,13 @@ static int futex_wait(unsigned long uadd
+@@ -578,8 +578,13 @@ static int futex_wait(unsigned long uadd
* !list_empty() is safe here without any lock.
* q.lock_ptr != 0 is not safe, because of ordering against wakeup.
*/
@@ -15060,7 +15064,7 @@
--- linux/drivers/usb/core/hcd.c.orig
+++ linux/drivers/usb/core/hcd.c
-@@ -331,7 +331,9 @@ static int rh_call_control (struct usb_h
+@@ -332,7 +332,9 @@ static int rh_call_control (struct usb_h
u8 *ubuf = urb->transfer_buffer;
int len = 0;
int patch_wakeup = 0;
@@ -15070,7 +15074,7 @@
cmd = (struct usb_ctrlrequest *) urb->setup_packet;
typeReq = (cmd->bRequestType << 8) | cmd->bRequest;
-@@ -466,9 +468,13 @@ error:
+@@ -467,9 +469,13 @@ error:
}
/* any errors get returned through the urb completion */
@@ -15084,7 +15088,7 @@
return 0;
}
-@@ -518,15 +524,13 @@ static void rh_report_status (unsigned l
+@@ -519,15 +525,13 @@ static void rh_report_status (unsigned l
unsigned long flags;
urb = (struct urb *) ptr;
@@ -15102,7 +15106,7 @@
return;
}
-@@ -544,12 +548,12 @@ static void rh_report_status (unsigned l
+@@ -545,12 +549,12 @@ static void rh_report_status (unsigned l
mod_timer (&hcd->rh_timer, jiffies + HZ/4);
}
spin_unlock (&hcd_data_lock);
@@ -15117,7 +15121,7 @@
}
/*-------------------------------------------------------------------------*/
-@@ -575,17 +579,23 @@ static int rh_urb_enqueue (struct usb_hc
+@@ -576,17 +580,23 @@ static int rh_urb_enqueue (struct usb_hc
static int usb_rh_urb_dequeue (struct usb_hcd *hcd, struct urb *urb)
{
@@ -15141,7 +15145,7 @@
} else if (usb_pipeendpoint(urb->pipe) == 0) {
spin_lock_irq(&urb->lock); /* from usb_kill_urb */
-@@ -1300,15 +1310,13 @@ hcd_endpoint_disable (struct usb_device
+@@ -1301,15 +1311,13 @@ hcd_endpoint_disable (struct usb_device
WARN_ON (!HCD_IS_RUNNING (hcd->state) && hcd->state != USB_STATE_HALT);
@@ -15158,7 +15162,7 @@
list_for_each_entry (urb, &ep->urb_list, urb_list) {
int tmp;
-@@ -1321,13 +1329,13 @@ rescan:
+@@ -1322,13 +1330,13 @@ rescan:
if (urb->status != -EINPROGRESS)
continue;
usb_get_urb (urb);
@@ -15175,7 +15179,7 @@
/* kick hcd unless it's already returning this */
if (tmp == -EINPROGRESS) {
-@@ -1350,8 +1358,7 @@ rescan:
+@@ -1351,8 +1359,7 @@ rescan:
/* list contents may have changed */
goto rescan;
}
@@ -15363,7 +15367,7 @@
--- linux/drivers/ide/ide-io.c.orig
+++ linux/drivers/ide/ide-io.c
-@@ -1052,7 +1052,9 @@ static void ide_do_request (ide_hwgroup_
+@@ -1053,7 +1053,9 @@ static void ide_do_request (ide_hwgroup_
ide_get_lock(ide_intr, hwgroup);
/* caller must own ide_lock */
@@ -15373,7 +15377,7 @@
while (!hwgroup->busy) {
hwgroup->busy = 1;
-@@ -1313,7 +1315,7 @@ void ide_timer_expiry (unsigned long dat
+@@ -1314,7 +1316,7 @@ void ide_timer_expiry (unsigned long dat
#endif /* DISABLE_IRQ_NOSYNC */
/* local CPU only,
* as if we were handling an interrupt */
@@ -19815,6 +19819,15 @@
}
--- linux/Makefile.orig
+++ linux/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 11
+-EXTRAVERSION =
++EXTRAVERSION = -RT-V0.7.40-00
+ NAME=Woozy Numbat
+
+ # *DOCUMENTATION*
@@ -518,10 +518,14 @@ CFLAGS += $(call add-align,CONFIG_CC_AL
CFLAGS += $(call add-align,CONFIG_CC_ALIGN_LOOPS,-loops)
CFLAGS += $(call add-align,CONFIG_CC_ALIGN_JUMPS,-jumps)