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

Collapse All | Expand All

(-)work/common/lib/modules/fglrx/build_mod/drmP.h (-1 / +1 lines)
Lines 42-48 Link Here
42
 * can build the DRM (part of PI DRI). 4/21/2000 S + B */
42
 * can build the DRM (part of PI DRI). 4/21/2000 S + B */
43
#include <asm/current.h>
43
#include <asm/current.h>
44
#endif /* __alpha__ */
44
#endif /* __alpha__ */
45
#include <linux/autoconf.h>
45
#include <generated/autoconf.h>
46
#include <linux/module.h>
46
#include <linux/module.h>
47
#include <linux/kernel.h>
47
#include <linux/kernel.h>
48
#include <linux/miscdevice.h>
48
#include <linux/miscdevice.h>
(-)work/common/lib/modules/fglrx/build_mod/firegl_public.c (-4 / +6 lines)
Lines 28-34 Link Here
28
#error Kernel versions older than 2.6.0 are no longer supported by this module.
28
#error Kernel versions older than 2.6.0 are no longer supported by this module.
29
#endif 
29
#endif 
30
30
31
#include <linux/autoconf.h>
31
#include <generated/autoconf.h>
32
32
33
#if !defined(CONFIG_X86) 
33
#if !defined(CONFIG_X86) 
34
#if !defined(CONFIG_X86_PC) 
34
#if !defined(CONFIG_X86_PC) 
Lines 167-175 Link Here
167
#include "linux/freezer.h"
167
#include "linux/freezer.h"
168
#endif
168
#endif
169
169
170
//  For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. 
170
//  For 2.6.32 or higher, the UTS_RELEASE is defined in the generated/utsrelease.h. 
171
#ifndef UTS_RELEASE 
171
#ifndef UTS_RELEASE 
172
#include <linux/utsrelease.h>
172
#include <generated/utsrelease.h>
173
#endif
173
#endif
174
174
175
#if defined(__i386__)
175
#if defined(__i386__)
Lines 1441-1447 Link Here
1441
todo !!!
1441
todo !!!
1442
#endif
1442
#endif
1443
1443
1444
unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
1444
void __cmpxchg_wrong_size(void) {}
1445
1446
unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
1445
         unsigned long new, int size)
1447
         unsigned long new, int size)
1446
{
1448
{
1447
#ifndef __HAVE_ARCH_CMPXCHG
1449
#ifndef __HAVE_ARCH_CMPXCHG
(-)work/common/lib/modules/fglrx/build_mod/firegl_public.h (-1 / +2 lines)
Lines 441-447 Link Here
441
extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
441
extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
442
extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
442
extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
443
443
444
extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,                      
444
extern void __cmpxchg_wrong_size(void);
445
extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,                      
445
                      unsigned long new, int size);
446
                      unsigned long new, int size);
446
447
447
#define __ke_cmpxchg(ptr,o,n)                        \
448
#define __ke_cmpxchg(ptr,o,n)                        \
(-)work/common/lib/modules/fglrx/build_mod/kcl_acpi.c (-1 / +1 lines)
Lines 15-21 Link Here
15
 ****************************************************************************/
15
 ****************************************************************************/
16
16
17
#include <linux/version.h>
17
#include <linux/version.h>
18
#include <linux/autoconf.h>
18
#include <generated/autoconf.h>
19
#include <linux/acpi.h>
19
#include <linux/acpi.h>
20
20
21
#include "kcl_config.h"
21
#include "kcl_config.h"
(-)work/common/lib/modules/fglrx/build_mod/kcl_agp.c (-1 / +1 lines)
Lines 31-37 Link Here
31
 */
31
 */
32
32
33
#include <linux/version.h>
33
#include <linux/version.h>
34
#include <linux/autoconf.h>
34
#include <generated/autoconf.h>
35
#include <linux/pci.h>
35
#include <linux/pci.h>
36
#include <linux/agp_backend.h>
36
#include <linux/agp_backend.h>
37
#include <linux/string.h>
37
#include <linux/string.h>
(-)work/common/lib/modules/fglrx/build_mod/kcl_io.c (-1 / +2 lines)
Lines 37-44 Link Here
37
 */
37
 */
38
38
39
#include <linux/version.h>
39
#include <linux/version.h>
40
#include <linux/autoconf.h>
40
#include <generated/autoconf.h>
41
#include <linux/poll.h>
41
#include <linux/poll.h>
42
#include <linux/signal.h>
42
#include <asm/io.h>
43
#include <asm/io.h>
43
44
44
#include "kcl_config.h"
45
#include "kcl_config.h"
(-)work/common/lib/modules/fglrx/build_mod/kcl_osconfig.h (-1 / +1 lines)
Lines 20-26 Link Here
20
#define KCL_OSCONFIG_H
20
#define KCL_OSCONFIG_H
21
21
22
#include <linux/version.h>
22
#include <linux/version.h>
23
#include <linux/autoconf.h>
23
#include <generated/autoconf.h>
24
24
25
// Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
25
// Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
26
#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
26
#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
(-)work/common/lib/modules/fglrx/build_mod/kcl_pci.c (-1 / +1 lines)
Lines 31-37 Link Here
31
 */
31
 */
32
32
33
#include <linux/version.h>
33
#include <linux/version.h>
34
#include <linux/autoconf.h>
34
#include <generated/autoconf.h>
35
#include <linux/pci.h>
35
#include <linux/pci.h>
36
36
37
#include "kcl_config.h"
37
#include "kcl_config.h"
(-)work/common/lib/modules/fglrx/build_mod/kcl_str.c (-1 / +1 lines)
Lines 30-36 Link Here
30
 *
30
 *
31
 */
31
 */
32
32
33
#include <linux/autoconf.h>
33
#include <generated/autoconf.h>
34
#include <linux/string.h>
34
#include <linux/string.h>
35
#include <linux/module.h>
35
#include <linux/module.h>
36
36
(-)work/common/lib/modules/fglrx/build_mod/kcl_wait.c (-1 / +1 lines)
Lines 31-37 Link Here
31
 */
31
 */
32
32
33
#include <linux/version.h>
33
#include <linux/version.h>
34
#include <linux/autoconf.h>
34
#include <generated/autoconf.h>
35
#include <linux/wait.h>
35
#include <linux/wait.h>
36
#include <linux/highmem.h>
36
#include <linux/highmem.h>
37
#include <linux/sched.h>
37
#include <linux/sched.h>
(-)work/common/lib/modules/fglrx/build_mod/make.sh (-6 / +6 lines)
Lines 218-225 Link Here
218
        # UTS-define is in external version-*.h files, i.e. linux-2.2.14-5.0-RedHat does this flaw
218
        # UTS-define is in external version-*.h files, i.e. linux-2.2.14-5.0-RedHat does this flaw
219
        kernel_release=`cat $linuxincludes/linux/version-*.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
219
        kernel_release=`cat $linuxincludes/linux/version-*.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
220
    else
220
    else
221
        # For 2.6.18 or higher, UTS-define is defined in utsrelease.h.
221
        # For 2.6.32 or higher, UTS-define is defined in utsrelease.h.
222
        kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
222
        kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
223
    fi
223
    fi
224
  fi
224
  fi
225
fi
225
fi
Lines 300-308 Link Here
300
fi
300
fi
301
301
302
# 3
302
# 3
303
# linux/autoconf.h may contain this: #define CONFIG_SMP 1
303
# generated/autoconf.h may contain this: #define CONFIG_SMP 1
304
304
305
src_file=$linuxincludes/linux/autoconf.h
305
src_file=$linuxincludes/generated/autoconf.h
306
306
307
if [ ! -e $src_file ]; then
307
if [ ! -e $src_file ]; then
308
  echo "Warning:"                                                  >> $logfile
308
  echo "Warning:"                                                  >> $logfile
Lines 354-361 Link Here
354
354
355
MODVERSIONS=0
355
MODVERSIONS=0
356
356
357
# linux/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1
357
# generated/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1
358
src_file=$linuxincludes/linux/autoconf.h
358
src_file=$linuxincludes/generated/autoconf.h
359
if [ ! -e $src_file ];
359
if [ ! -e $src_file ];
360
then
360
then
361
  echo "Warning:"                                                  >> $logfile
361
  echo "Warning:"                                                  >> $logfile

Return to bug 294997