andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'kibi/master'

Browse Source
This commit is contained in:
Keith Packard 2012-01-09 11:37:59 -08:00
commit 1f5587e144
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/xfree86/common/compiler.h
View File

@ -397,25 +397,6 @@ extern _X_EXPORT unsigned int inl(unsigned int port);
#include <machine/pio.h>
#endif /* __NetBSD__ */
# elif defined(linux) && defined(__ia64__)
# include <inttypes.h>
# include <sys/io.h>
# undef outb
# undef outw
# undef outl
# undef inb
# undef inw
# undef inl
extern _X_EXPORT void outb(unsigned long port, unsigned char val);
extern _X_EXPORT void outw(unsigned long port, unsigned short val);
extern _X_EXPORT void outl(unsigned long port, unsigned int val);
extern _X_EXPORT unsigned int inb(unsigned long port);
extern _X_EXPORT unsigned int inw(unsigned long port);
extern _X_EXPORT unsigned int inl(unsigned long port);
# elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
# include <inttypes.h>

6
os/backtrace.c
View File

@ -46,7 +46,11 @@ void xorg_backtrace(void)
ErrorF("\nBacktrace:\n");
size = backtrace(array, 64);
for (i = 0; i < size; i++) {
dladdr(array[i], &info);
int rc = dladdr(array[i], &info);
if (rc == 0) {
ErrorF("%d: ?? [%p]\n", i, array[i]);
continue;
}
mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)";
if (info.dli_saddr)
ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod,