Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 266819 | Differences between
and this patch

Collapse All | Expand All

(-)build_mod/firegl_public.c (-3 / +22 lines)
Lines 1460-1466 KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(vo Link Here
1460
 */
1460
 */
1461
KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
1461
KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
1462
{
1462
{
1463
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
1464
    return current->cred->euid;
1465
#else
1463
    return current->euid;
1466
    return current->euid;
1467
#endif
1464
}
1468
}
1465
1469
1466
/** /brief Delay execution for the specified number of microseconds
1470
/** /brief Delay execution for the specified number of microseconds
Lines 1832-1846 int ATI_API_CALL KCL_PosixSecurityCapChe Link Here
1832
 */
1836
 */
1833
void ATI_API_CALL KCL_PosixSecurityCapSetIPCLock(unsigned int lock)
1837
void ATI_API_CALL KCL_PosixSecurityCapSetIPCLock(unsigned int lock)
1834
{
1838
{
1839
1840
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
1841
    struct cred *new = prepare_creds();
1842
    if (!new) {
1843
	    printk(KERN_ERR "fglrx: could not allocate memory\n");
1844
	    return;
1845
    }
1846
#else
1847
#define new current
1848
#endif
1835
    if (lock == 0 )
1849
    if (lock == 0 )
1836
    {
1850
    {
1837
        cap_lower(current->cap_effective, CAP_IPC_LOCK);
1851
        cap_lower(new->cap_effective, CAP_IPC_LOCK);
1838
    }
1852
    }
1839
    else
1853
    else
1840
    {
1854
    {
1841
        cap_raise(current->cap_effective, CAP_IPC_LOCK);
1855
        cap_raise(new->cap_effective, CAP_IPC_LOCK);
1842
    }    
1856
    }    
1843
    return; 
1857
1858
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
1859
    commit_creds(new);
1860
#else
1861
#undef new
1862
#endif
1844
}
1863
}
1845
1864
1846
/** \brief Get number of available RAM pages
1865
/** \brief Get number of available RAM pages
(-)build_mod/firegl_public.h (+7 lines)
Lines 18-23 Link Here
18
#define _FIREGL_PUBLIC_H_
18
#define _FIREGL_PUBLIC_H_
19
19
20
#include <stdarg.h>
20
#include <stdarg.h>
21
#include <asm/pgtable.h>
21
#include "kcl_pci.h"
22
#include "kcl_pci.h"
22
#include "kcl_io.h"
23
#include "kcl_io.h"
23
24
Lines 590-595 extern unsigned long KCL_SYSINFO_ Link Here
590
#define cpu_has_pge test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability)
591
#define cpu_has_pge test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability)
591
#endif
592
#endif
592
593
594
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
595
#undef pgprot_writecombine
596
#undef pgprot_noncached
597
#endif
598
593
#ifndef pgprot_writecombine
599
#ifndef pgprot_writecombine
594
#define pgprot_writecombine(prot) __pgprot((pgprot_val(prot) & ~(_PAGE_PCD)) | _PAGE_PWT)
600
#define pgprot_writecombine(prot) __pgprot((pgprot_val(prot) & ~(_PAGE_PCD)) | _PAGE_PWT)
595
#endif
601
#endif
Lines 598-603 extern unsigned long KCL_SYSINFO_ Link Here
598
#define pgprot_noncached(prot) __pgprot(pgprot_val(prot) | _PAGE_PCD | _PAGE_PWT)
604
#define pgprot_noncached(prot) __pgprot(pgprot_val(prot) | _PAGE_PCD | _PAGE_PWT)
599
#endif
605
#endif
600
606
607
601
#endif //FIREGL_USWC_SUPPORT
608
#endif //FIREGL_USWC_SUPPORT
602
609
603
610
(-)build_mod/kcl_acpi.c (+6 lines)
Lines 18-23 Link Here
18
#include <linux/autoconf.h>
18
#include <linux/autoconf.h>
19
#include <linux/acpi.h>
19
#include <linux/acpi.h>
20
20
21
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
22
#include <../drivers/acpi/acpica/acconfig.h>
23
#include <../drivers/acpi/acpica/aclocal.h>
24
#include <../drivers/acpi/acpica/acobject.h>
25
#endif
26
21
#include "kcl_config.h"
27
#include "kcl_config.h"
22
#include "kcl_type.h"
28
#include "kcl_type.h"
23
#include "kcl_acpi.h"
29
#include "kcl_acpi.h"
24
#include "kcl_acpi.h"
30
#include "kcl_acpi.h"

Return to bug 266819