From a7123f0edfea20a68e64e447dc6ca0c32736be0e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 1 Oct 1999 16:09:12 +0000 Subject: Update. 1999-10-01 Andreas Jaeger * locale/programs/ld-collate.c (insert_value): Add cast to avoid warning. * intl/finddomain.c (_nl_find_domain): Likewise. 1999-09-30 Andreas Schwab * sysdeps/unix/sysv/linux/alpha/ioperm.c: Disable debug messages. 1999-09-30 Andreas Jaeger * sysdeps/i386/lshift.S: Correct assembler commands to fix warnings. * sysdeps/i386/rshift.S: Likewise. * sysdeps/i386/strchrnul.S: Likewise. * sysdeps/i386/strchr.S: Likewise. Patch by Michael Deutschmann , PR libc/1339. 1999-09-30 Andreas Jaeger * manual/examples/pipe.c: Close other end of pipe to make example work. 1999-10-01 Ulrich Drepper * timezone/checktab.awk: Update from tzcode1999g. * timezone/tzselect.ksh: Likewise. * timezone/africa: Update from tzdata1999g. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/europe: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/iso3166.tab: Likewise. * timezone/zone.tab: Likewise. been renamed to getipnodebyname. Move flags around. --- sysdeps/unix/sysv/linux/alpha/ioperm.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'sysdeps/unix/sysv/linux/alpha/ioperm.c') diff --git a/sysdeps/unix/sysv/linux/alpha/ioperm.c b/sysdeps/unix/sysv/linux/alpha/ioperm.c index 5b2edd0..7b38fcc 100644 --- a/sysdeps/unix/sysv/linux/alpha/ioperm.c +++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c @@ -436,6 +436,8 @@ static struct ioswtch ioswtch[] = { } }; +#undef DEBUG_IOPERM + /* routine to process the /proc/cpuinfo information into the fields */ /* that are required for correctly determining the platform parameters */ @@ -474,7 +476,7 @@ process_cpuinfo(void) fclose (fp); -#if 1 +#ifdef DEBUG_IOPERM fprintf(stderr, "system type: %s\n", systype); fprintf(stderr, "system vari: %s\n", sysvari); fprintf(stderr, "cpu model: %s\n", cpumodel); @@ -598,7 +600,7 @@ init_iosys (void) /* systype is not a know platform name... */ __set_errno (EINVAL); -#if 1 +#ifdef DEBUG_IOPERM fprintf(stderr, "init_iosys: platform not recognized\n"); #endif return -1; @@ -612,7 +614,7 @@ _ioperm (unsigned long int from, unsigned long int num, int turn_on) int prot, err; if (!io.swp && init_iosys() < 0) { -#if 1 +#ifdef DEBUG_IOPERM fprintf(stderr, "ioperm: init_iosys() failed\n"); #endif return -1; @@ -622,13 +624,13 @@ _ioperm (unsigned long int from, unsigned long int num, int turn_on) if (from >= MAX_PORT || from + num > MAX_PORT) { __set_errno (EINVAL); -#if 1 +#ifdef DEBUG_IOPERM fprintf(stderr, "ioperm: from/num out of range\n"); #endif return -1; } -#if 1 +#ifdef DEBUG_IOPERM fprintf(stderr, "ioperm: turn_on %d io.base %ld\n", turn_on, io.base); #endif @@ -645,7 +647,7 @@ _ioperm (unsigned long int from, unsigned long int num, int turn_on) fd = open ("/dev/mem", O_RDWR); if (fd < 0) { -#if 1 +#ifdef DEBUG_IOPERM fprintf(stderr, "ioperm: /dev/mem open failed\n"); #endif return -1; @@ -657,7 +659,7 @@ _ioperm (unsigned long int from, unsigned long int num, int turn_on) (unsigned long int) __mmap (0, len, PROT_NONE, MAP_SHARED, fd, io.io_base); close (fd); -#if 1 +#ifdef DEBUG_IOPERM fprintf(stderr, "ioperm: mmap of len 0x%lx returned 0x%lx\n", len, io.base); #endif @@ -678,7 +680,7 @@ _ioperm (unsigned long int from, unsigned long int num, int turn_on) addr &= PAGE_MASK; len = port_to_cpu_addr (from + num, io.swiz, 1) - addr; err = mprotect ((void *) addr, len, prot); -#if 1 +#ifdef DEBUG_IOPERM fprintf(stderr, "ioperm: mprotect returned %d\n", err); #endif return err; -- cgit v1.1