diff options
| author | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
| commit | 16b02d711f4059b8338ef967064195b47cae65ea (patch) | |
| tree | 6d3e0b7629210b56f8d6cfa39184c878d8a15367 /Documentation/prctl/disable-tsc-test.c | |
| parent | b15d53d009558d14c4f394a6d1fa2039c7f45c43 (diff) | |
| parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
| download | talos-op-linux-16b02d711f4059b8338ef967064195b47cae65ea.tar.gz talos-op-linux-16b02d711f4059b8338ef967064195b47cae65ea.zip | |
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to 'Documentation/prctl/disable-tsc-test.c')
| -rw-r--r-- | Documentation/prctl/disable-tsc-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/prctl/disable-tsc-test.c b/Documentation/prctl/disable-tsc-test.c index 2541e65cb64b..8d494f7bebdb 100644 --- a/Documentation/prctl/disable-tsc-test.c +++ b/Documentation/prctl/disable-tsc-test.c @@ -57,7 +57,7 @@ static void sigsegv_cb(int sig) printf("rdtsc() == "); } -int main(int argc, char **argv) +int main(void) { int tsc_val = 0; |
