← Back to branch summary

~ubuntu-branches/ubuntu/lucid/user-mode-linux/lucid

« back to all changes in this revision

Viewing changes to debian/patches/04_aio_fix.diff

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-05-27 23:18:50 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070527231850-6hsex3zo84r5cgag
Tags: 2.6.22-2um-0ubuntu1
* Merge with Debian unstable. Remaining changes:
  - Update for 2.6.22
    + Remove reference to aio_reserved3 (removed from struct iocb)
  - Update maintainer per DebianMaintainerField

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_aio_fix.diff
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 04_aio_fix.diff - Soren Hansen <sh@linux2go.dk>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Remove aio_reserved3 since it's gone in the Ubuntu kernel tree
 
6
 
 
7
@DPATCH@
 
8
 
 
9
# Author: shawarma
 
10
# Status: none
 
11
 
 
12
--- linux-source-2.6.22/arch/um/os-Linux/aio.c.orig     2007-05-28 07:24:32.345841845 +0000
 
13
+++ linux-source-2.6.22/arch/um/os-Linux/aio.c  2007-05-28 07:24:44.925883929 +0000
 
14
@@ -77,7 +77,7 @@
 
15
                                .aio_offset     = offset,
 
16
                                .aio_reserved1  = 0,
 
17
                                .aio_reserved2  = 0,
 
18
-                               .aio_reserved3  = 0 });
 
19
+                               .aio_flags      = 0 });
 
20
 
 
21
        switch(type){
 
22
        case AIO_READ: