diff options
| author | Ben LaHaise <bcrl@kvack.org> | 2002-09-13 17:41:10 +0000 |
|---|---|---|
| committer | Ben LaHaise <bcrl@kvack.org> | 2002-09-13 17:41:10 +0000 |
| commit | b2c90deab7f58eaf0efb38e22d8fec3e05002ec8 (patch) | |
| tree | ccdb1fd2b9cbcbfb9f80d2fd133b98cce486d379 | |
| parent | 34c539fcb98c4397b9f04e93f8a475a9e445cf33 (diff) | |
| download | libaio-b2c90deab7f58eaf0efb38e22d8fec3e05002ec8.tar.gz | |
more libredhat-kernel squashes, updates to final abi
| -rw-r--r-- | harness/Makefile | 2 | ||||
| -rw-r--r-- | harness/cases/13.t | 2 | ||||
| -rw-r--r-- | harness/cases/2.t | 2 | ||||
| -rw-r--r-- | harness/cases/aio_setup.h | 2 | ||||
| -rw-r--r-- | harness/main.c | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/harness/Makefile b/harness/Makefile index 703f5b0..c396d82 100644 --- a/harness/Makefile +++ b/harness/Makefile @@ -4,7 +4,7 @@ PROGS:=$(patsubst %.t,%.p,$(TEST_SRCS)) HARNESS_SRCS:=main.c # io_queue.c -CFLAGS=-Wall -Werror -g -O -laio -lredhat-kernel +CFLAGS=-Wall -Werror -g -O -laio #-lpthread -lrt all: $(PROGS) diff --git a/harness/cases/13.t b/harness/cases/13.t index 1cebae9..d128a25 100644 --- a/harness/cases/13.t +++ b/harness/cases/13.t @@ -39,7 +39,7 @@ int test_main(void) struct io_event event; struct iocb *iocb; - res = io_getevents(io_ctx, 1, &event, &ts); + res = io_getevents(io_ctx, 0, 1, &event, &ts); if (res != 1) { status |= 1; printf("io_getevents failed [%d] with res=%d [%s]\n", diff --git a/harness/cases/2.t b/harness/cases/2.t index e878bde..3a0212d 100644 --- a/harness/cases/2.t +++ b/harness/cases/2.t @@ -4,8 +4,6 @@ - with maxevents <= 0 - with an already initialized ctxp */ -#define io_setup vsys_io_setup -extern int io_setup(unsigned nr_reqs, io_context_t *ctxp); int attempt(int n, io_context_t *ctxp, int expect) { diff --git a/harness/cases/aio_setup.h b/harness/cases/aio_setup.h index ed0947e..37c9618 100644 --- a/harness/cases/aio_setup.h +++ b/harness/cases/aio_setup.h @@ -43,7 +43,7 @@ int sync_submit(struct iocb *iocb) return res; } - res = io_getevents(io_ctx, 1, &event, &ts); + res = io_getevents(io_ctx, 0, 1, &event, &ts); if (res != 1) { printf("sync_submit: io_getevents res=%d [%s]\n", res, strerror(-res)); return res; diff --git a/harness/main.c b/harness/main.c index 37398a4..74b2764 100644 --- a/harness/main.c +++ b/harness/main.c @@ -13,7 +13,7 @@ #if defined(__i386__) #define KERNEL_RW_POINTER ((void *)0xc0010000) #else -#warning Not really sure where kernel memory is. Guessing. +//#warning Not really sure where kernel memory is. Guessing. #define KERNEL_RW_POINTER ((void *)0xffffffffc0010000) #endif |