d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo bad merge.

Browse Source
This commit is contained in:
rodrigc 2014-06-23 22:35:41 +00:00
parent 95d8d7a8ec
commit 360ded2657
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sbin/mount_nullfs/mount_nullfs.c
View File

@ -103,25 +103,18 @@ main(int argc, char *argv[])
err(EX_USAGE, "%s", source);
if (subdir(target, source) || subdir(source, target))
errx(EX_USAGE, "%s (%s) and %s are not lldistinct paths",
errx(EX_USAGE, "%s (%s) and %s are not distinct paths",
argv[0], target, argv[1]);
printf("Debug: 1\n");
build_iovec(&iov, &iovlen, "fstype", nullfs, (size_t)-1);
build_iovec(&iov, &iovlen, "fspath", source, (size_t)-1);
build_iovec(&iov, &iovlen, "target", target, (size_t)-1);
build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
printf("Debug: 2, source: %zd target: %zdd\n", strlen(source), strlen(target));
if (nmount(iov, iovlen, 0) < 0) {
printf("Debug: 3\n");
if (errmsg[0] != 0) {
printf("Debug 4\n");
if (errmsg[0] != 0)
err(1, "%s: %s", source, errmsg);
}
else {
printf("Debug 5\n");
else
err(1, "%s", source);
}
}
exit(0);
}

12
sys/x86/acpica/madt.c
View File

@ -306,11 +306,10 @@ interrupt_polarity(UINT16 IntiFlags, UINT8 Source)
case ACPI_MADT_POLARITY_ACTIVE_HIGH:
return (INTR_POLARITY_HIGH);
case ACPI_MADT_POLARITY_ACTIVE_LOW:
break;
return (INTR_POLARITY_LOW);
default:
printf("WARNING: Bogus Interrupt Polarity. Assume POLALITY LOW");
panic("Bogus Interrupt Polarity");
}
return (INTR_POLARITY_LOW);
}
static enum intr_trigger
@ -326,13 +325,10 @@ interrupt_trigger(UINT16 IntiFlags, UINT8 Source)
case ACPI_MADT_TRIGGER_EDGE:
return (INTR_TRIGGER_EDGE);
case ACPI_MADT_TRIGGER_LEVEL:
break;
return (INTR_TRIGGER_LEVEL);
default:
printf("WARNING: Bogus Interrupt Trigger Mode. Assume Level trigger.");
break;
panic("Bogus Interrupt Trigger Mode");
}
return (INTR_TRIGGER_LEVEL);
}
/*