diff options
author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-05-20 17:43:25 +0000 |
---|---|---|
committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-05-20 17:43:25 +0000 |
commit | b65519b91f0dbc706aa372fa165cdd535e572ab9 (patch) | |
tree | 73be7b710de0dcf211eb9b47772a223655fe792f /xenolinux-2.4.26-sparse/arch | |
parent | c5d63dfc853a34d5af27b54d4456fbff11bf9cd8 (diff) | |
parent | 6bf53ef08d47db840c3d18ed5eb0e1fcf1dda730 (diff) | |
download | xen-b65519b91f0dbc706aa372fa165cdd535e572ab9.tar.gz xen-b65519b91f0dbc706aa372fa165cdd535e572ab9.tar.bz2 xen-b65519b91f0dbc706aa372fa165cdd535e572ab9.zip |
bitkeeper revision 1.917 (40acee3d26HD4ugLPjY-eN66o0rNIg)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xeno.bk
Diffstat (limited to 'xenolinux-2.4.26-sparse/arch')
-rw-r--r-- | xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c index fbe5c4ecf6..e6c340685a 100644 --- a/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c +++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c @@ -381,6 +381,10 @@ xc_linux_save */ /* With live migrate, we even get these... Disable for now. */ // printk(KERN_ALERT "bad buffer on RX ring!(%d)\n", rx->status); } + else + phys_to_machine_mapping[virt_to_phys(skb->head) >> PAGE_SHIFT] = + 0x80000004; // disown this page -- it was a flush + dev_kfree_skb_any(skb); continue; } |