diff options
| author | Michael Krelin <hacker@klever.net> | 2007-05-03 21:51:55 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-03 21:51:55 +0000 |
| commit | 5c59726be653249443ecfdb084bff22c948f2eec (patch) | |
| tree | db822d22595dfdb0bf518a604836a9918f425bf9 /packages/qte/qte-2.3.10 | |
| parent | 1280d3735aefbfebd0fce63565f1c166e712b481 (diff) | |
qte 2.3.10: Fix lack of PAGE_* in latest linux-headers properly: use getpagesize()
* Closes #2201.
Diffstat (limited to 'packages/qte/qte-2.3.10')
| -rw-r--r-- | packages/qte/qte-2.3.10/kernel-asm-page.patch | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/packages/qte/qte-2.3.10/kernel-asm-page.patch b/packages/qte/qte-2.3.10/kernel-asm-page.patch index cbbd114144..bad2d95967 100644 --- a/packages/qte/qte-2.3.10/kernel-asm-page.patch +++ b/packages/qte/qte-2.3.10/kernel-asm-page.patch @@ -1,14 +1,20 @@ diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp -index c2e7d9b..b2d42b5 100644 +index c2e7d9b..8d39585 100644 --- a/src/kernel/qpixmapcache.cpp +++ b/src/kernel/qpixmapcache.cpp -@@ -122,7 +122,9 @@ void cleanup_pixmap_cache(); - +@@ -123,9 +123,13 @@ void cleanup_pixmap_cache(); #ifdef THROW_AWAY_UNUSED_PAGES # include <sys/mman.h> // madvise -+# define __KERNEL__ # include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN -+# undef __KERNEL__ ++# include <unistd.h> // getpagesize() ++# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK) ++# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) ++# endif # ifndef PAGE_ALIGN - # define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) - # endif // PAGE_ALIGN +-# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) +-# endif // PAGE_ALIGN ++# define PAGE_ALIGN(addr) (((addr)+getpagesize()-1)&~(getpagesize()-1)) ++# endif + #endif // THROW_AWAY_UNUSED_PAGES + + |