diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-06-10 16:36:32 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-06-10 16:36:32 +0200 |
| commit | 5c853480c724cb3ff4670be6d2b5ac59f8407e14 (patch) | |
| tree | 9e83c42b2f6c7d94cbd5efed9f27ea79c1fda65e /debian | |
| parent | 338d0a95df95d5fe495c8f2bb106b25189d58e32 (diff) | |
update pp.patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/pp.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 6 |
2 files changed, 31 insertions, 8 deletions
diff --git a/debian/patches/pp.patch b/debian/patches/pp.patch index 2c3d7bdd..7e0029c9 100644 --- a/debian/patches/pp.patch +++ b/debian/patches/pp.patch @@ -365,7 +365,7 @@ index 38971ff..6cdf3db 100644 begin_using_notify_port, and is arranged for the fs_notify interfaces by mutations.h. */ diff --git a/libdiskfs/diskfs.h b/libdiskfs/diskfs.h -index 2c68aa3..5b4ae85 100644 +index e328527..ffad7a3 100644 --- a/libdiskfs/diskfs.h +++ b/libdiskfs/diskfs.h @@ -833,8 +833,14 @@ error_t diskfs_start_protid (struct peropen *po, struct protid **cred); @@ -1381,18 +1381,41 @@ index c910824..9dc3626 100644 destructor: end_using_exc (exc_t); routine proc_exception_raise ( +diff --git a/term/mig-decls.h b/term/mig-decls.h +index c91b133..09b45c6 100644 +--- a/term/mig-decls.h ++++ b/term/mig-decls.h +@@ -32,6 +32,12 @@ begin_using_ctty_port (mach_port_t port) + return ports_lookup_port (term_bucket, port, cttyid_class); + } + ++static inline struct port_info * __attribute__ ((unused)) ++begin_using_ctty_payload (unsigned long payload) ++{ ++ return ports_lookup_payload (term_bucket, payload, cttyid_class); ++} ++ + static inline void __attribute__ ((unused)) + end_using_ctty (struct port_info *p) + { diff --git a/term/mig-mutate.h b/term/mig-mutate.h -index a6b99fe..8927e3a 100644 +index 1545719..af8877e 100644 --- a/term/mig-mutate.h +++ b/term/mig-mutate.h -@@ -20,6 +20,7 @@ +@@ -20,10 +20,13 @@ /* Only CPP macro definitions should go in this file. */ #define IO_INTRAN trivfs_protid_t trivfs_begin_using_protid (io_t) +#define IO_INTRAN_PAYLOAD trivfs_protid_t trivfs_begin_using_protid_payload #define IO_DESTRUCTOR trivfs_end_using_protid (trivfs_protid_t) - #define TIOCTL_IMPORTS import "../libtrivfs/mig-decls.h"; - #define TERM_IMPORTS import "../libtrivfs/mig-decls.h"; + + #define CTTY_INTRAN \ + port_info_t begin_using_ctty_port (mach_port_t) ++#define CTTY_INTRAN_PAYLOAD \ ++ port_info_t begin_using_ctty_payload + #define CTTY_DESTRUCTOR \ + end_using_ctty (port_info_t) + diff --git a/trans/Makefile b/trans/Makefile index 71e6424..24ab9d8 100644 --- a/trans/Makefile diff --git a/debian/patches/series b/debian/patches/series index f9aa316f..f4d9ec88 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -42,9 +42,9 @@ xkb-compat.patch mach-defpager-protected-payload.patch fix-net_rcv_msg.patch -pp.patch -pp-dde.patch -pp-random.patch 0001-term-improve-the-demuxer.patch 0002-hurd-fix-receiver-lookup-in-termctty_open_terminal.patch 0003-libdiskfs-add-permission-check-to-file_chflags.patch +pp.patch +pp-dde.patch +pp-random.patch |