X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fsyscall-legacy.hc;h=f05daeeb596f9d7e7dbd99b42f00376fcf3e15db;hb=38fe8b4a2dd28aebf52787c5b65cc79490fa53d3;hp=7ba077db39156f3c7b9b0e1d1a4e1c8c0b9ea580;hpb=4c0037aecd96cf23da727c12381723ab5cbfa5e4;p=util-vserver.git diff --git a/util-vserver/lib/syscall-legacy.hc b/util-vserver/lib/syscall-legacy.hc index 7ba077d..f05daee 100644 --- a/util-vserver/lib/syscall-legacy.hc +++ b/util-vserver/lib/syscall-legacy.hc @@ -50,10 +50,10 @@ static int __NR_set_ipv4root_rev2; static int __NR_set_ipv4root_rev3; static int rev_ipv4root=0; -#if (defined(__pic__) && defined(__i386)) || defined(__hppa__) -#if defined __dietlibc__ +#ifdef ENSC_SYSCALL_TRADITIONAL +# if defined __dietlibc__ extern long int syscall (long int __sysno, ...); -#endif +# endif inline static int set_ipv4root_rev0(unsigned long ip) @@ -79,37 +79,29 @@ set_ipv4root_rev3(unsigned long *ip, int nb, unsigned long bcast, unsigned long return syscall(__NR_set_ipv4root_rev3, ip, nb, bcast, mask); } -#else +#else // ENSC_SYSCALL_TRADITIONAL inline static _syscall1(int, set_ipv4root_rev0, unsigned long, ip) inline static _syscall2(int, set_ipv4root_rev1, unsigned long, ip, unsigned long, bcast) inline static _syscall3(int, set_ipv4root_rev2, unsigned long *, ip, int, nb, unsigned long, bcast) inline static _syscall4(int, set_ipv4root_rev3, unsigned long *, ip, int, nb, unsigned long, bcast, unsigned long *, mask) -#endif +#endif // ENSC_SYSCALL_TRADITIONAL static int def_NR_new_s_context = 273; #undef __NR_new_s_context static int __NR_new_s_context_rev0; - //static int __NR_new_s_context_rev1; static int rev_s_context=0; -#if defined(__pic__) && defined(__i386) -inline static int + +#ifdef ENSC_SYSCALL_TRADITIONAL +inline static xid_t new_s_context_rev0(int newctx, int remove_cap, int flags) { return syscall(__NR_new_s_context_rev0, newctx, remove_cap, flags); } -#else +#else // ENSC_SYSCALL_TRADITIONAL inline static _syscall3(int, new_s_context_rev0, int, newctx, int, remove_cap, int, flags) - //static _syscall4(int, new_s_context_rev1, int, nbctx, int *, ctxs, int, remove_cap, int, flags) -#endif - -#if 0 -#undef __NR_set_ctxlimit -static int __NR_set_ctxlimit=-1; -static int rev_set_ctxlimit=-1; +#endif // ENSC_SYSCALL_TRADITIONAL -static _syscall2 (int, set_ctxlimit, int, resource, long, limit) -#endif static bool is_init = false; @@ -205,16 +197,16 @@ void vc_init_internal_legacy(int ctx_rev, int ctx_number, is_init = true; } -static ALWAYSINLINE int +static ALWAYSINLINE xid_t vc_new_s_context_legacy(int ctx, int remove_cap, int flags) { - int ret = -1; + xid_t ret = -1; init(); if (rev_s_context == 0){ return new_s_context_rev0(ctx, remove_cap, flags); }else{ errno = -ENOSYS; - ret = -1; + ret = VC_NOCTX; } return ret; } @@ -251,7 +243,7 @@ vc_set_ipv4root_legacy(uint32_t bcast, size_t nb, struct vc_ip_mask_pair const { unsigned long ip[nb]; unsigned long mask[nb]; - size_t i; + size_t i; for (i=0; i