aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/param.h13
-rw-r--r--include/linux/acct.h3
-rw-r--r--include/linux/cuda.h5
-rw-r--r--include/linux/elf.h18
-rw-r--r--include/linux/isdn_divertif.h4
-rw-r--r--include/linux/mroute6.h4
-rw-r--r--include/linux/patchkey.h4
-rw-r--r--include/linux/pmu.h4
-rw-r--r--include/linux/sound.h4
-rw-r--r--include/linux/soundcard.h4
-rw-r--r--include/video/edid.h6
11 files changed, 47 insertions, 22 deletions
diff --git a/include/asm-generic/param.h b/include/asm-generic/param.h
index cdf8251bfb6c..835632a3b468 100644
--- a/include/asm-generic/param.h
+++ b/include/asm-generic/param.h
@@ -1,12 +1,6 @@
1#ifndef __ASM_GENERIC_PARAM_H 1#ifndef __ASM_GENERIC_PARAM_H
2#define __ASM_GENERIC_PARAM_H 2#define __ASM_GENERIC_PARAM_H
3 3
4#ifdef __KERNEL__
5# define HZ CONFIG_HZ /* Internal kernel timer frequency */
6# define USER_HZ 100 /* some user interfaces are */
7# define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */
8#endif
9
10#ifndef HZ 4#ifndef HZ
11#define HZ 100 5#define HZ 100
12#endif 6#endif
@@ -21,4 +15,11 @@
21 15
22#define MAXHOSTNAMELEN 64 /* max length of hostname */ 16#define MAXHOSTNAMELEN 64 /* max length of hostname */
23 17
18#ifdef __KERNEL__
19# undef HZ
20# define HZ CONFIG_HZ /* Internal kernel timer frequency */
21# define USER_HZ 100 /* some user interfaces are */
22# define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */
23#endif
24
24#endif /* __ASM_GENERIC_PARAM_H */ 25#endif /* __ASM_GENERIC_PARAM_H */
diff --git a/include/linux/acct.h b/include/linux/acct.h
index 3e4737fa6cce..d537aa0ec414 100644
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
@@ -146,6 +146,9 @@ extern void acct_exit_ns(struct pid_namespace *);
146 * 146 *
147 */ 147 */
148 148
149#undef ACCT_VERSION
150#undef AHZ
151
149#ifdef CONFIG_BSD_PROCESS_ACCT_V3 152#ifdef CONFIG_BSD_PROCESS_ACCT_V3
150#define ACCT_VERSION 3 153#define ACCT_VERSION 3
151#define AHZ 100 154#define AHZ 100
diff --git a/include/linux/cuda.h b/include/linux/cuda.h
index 6a3e6385d3f3..9f9865ff781e 100644
--- a/include/linux/cuda.h
+++ b/include/linux/cuda.h
@@ -5,6 +5,9 @@
5 * Copyright (C) 1996 Paul Mackerras. 5 * Copyright (C) 1996 Paul Mackerras.
6 */ 6 */
7 7
8#ifndef _LINUX_CUDA_H
9#define _LINUX_CUDA_H
10
8/* CUDA commands (2nd byte) */ 11/* CUDA commands (2nd byte) */
9#define CUDA_WARM_START 0 12#define CUDA_WARM_START 0
10#define CUDA_AUTOPOLL 1 13#define CUDA_AUTOPOLL 1
@@ -34,3 +37,5 @@ extern int cuda_request(struct adb_request *req,
34extern void cuda_poll(void); 37extern void cuda_poll(void);
35 38
36#endif /* __KERNEL */ 39#endif /* __KERNEL */
40
41#endif /* _LINUX_CUDA_H */
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 31f0508d7da7..999b4f52e8e5 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -7,15 +7,6 @@
7#include <asm/elf.h> 7#include <asm/elf.h>
8#endif 8#endif
9 9
10struct file;
11
12#ifndef elf_read_implies_exec
13 /* Executables for which elf_read_implies_exec() returns TRUE will
14 have the READ_IMPLIES_EXEC personality flag set automatically.
15 Override in asm/elf.h as needed. */
16# define elf_read_implies_exec(ex, have_pt_gnu_stack) 0
17#endif
18
19/* 32-bit ELF base types. */ 10/* 32-bit ELF base types. */
20typedef __u32 Elf32_Addr; 11typedef __u32 Elf32_Addr;
21typedef __u16 Elf32_Half; 12typedef __u16 Elf32_Half;
@@ -414,6 +405,13 @@ typedef struct elf64_note {
414} Elf64_Nhdr; 405} Elf64_Nhdr;
415 406
416#ifdef __KERNEL__ 407#ifdef __KERNEL__
408#ifndef elf_read_implies_exec
409 /* Executables for which elf_read_implies_exec() returns TRUE will
410 have the READ_IMPLIES_EXEC personality flag set automatically.
411 Override in asm/elf.h as needed. */
412# define elf_read_implies_exec(ex, have_pt_gnu_stack) 0
413#endif
414
417#if ELF_CLASS == ELFCLASS32 415#if ELF_CLASS == ELFCLASS32
418 416
419extern Elf32_Dyn _DYNAMIC []; 417extern Elf32_Dyn _DYNAMIC [];
@@ -437,6 +435,8 @@ extern Elf64_Dyn _DYNAMIC [];
437#endif 435#endif
438 436
439/* Optional callbacks to write extra ELF notes. */ 437/* Optional callbacks to write extra ELF notes. */
438struct file;
439
440#ifndef ARCH_HAVE_EXTRA_ELF_NOTES 440#ifndef ARCH_HAVE_EXTRA_ELF_NOTES
441static inline int elf_coredump_extra_notes_size(void) { return 0; } 441static inline int elf_coredump_extra_notes_size(void) { return 0; }
442static inline int elf_coredump_extra_notes_write(struct file *file, 442static inline int elf_coredump_extra_notes_write(struct file *file,
diff --git a/include/linux/isdn_divertif.h b/include/linux/isdn_divertif.h
index 07821ca5955f..a5a50f523807 100644
--- a/include/linux/isdn_divertif.h
+++ b/include/linux/isdn_divertif.h
@@ -10,6 +10,8 @@
10 * 10 *
11 */ 11 */
12 12
13#ifndef _LINUX_ISDN_DIVERTIF_H
14#define _LINUX_ISDN_DIVERTIF_H
13 15
14/***********************************************************/ 16/***********************************************************/
15/* magic value is also used to control version information */ 17/* magic value is also used to control version information */
@@ -45,3 +47,5 @@ typedef struct
45/*********************/ 47/*********************/
46extern int DIVERT_REG_NAME(isdn_divert_if *); 48extern int DIVERT_REG_NAME(isdn_divert_if *);
47#endif 49#endif
50
51#endif /* _LINUX_ISDN_DIVERTIF_H */
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index a3759cb0ac10..6d8c7251eb8d 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -43,9 +43,11 @@ typedef unsigned short mifi_t;
43typedef __u32 if_mask; 43typedef __u32 if_mask;
44#define NIFBITS (sizeof(if_mask) * 8) /* bits per mask */ 44#define NIFBITS (sizeof(if_mask) * 8) /* bits per mask */
45 45
46#if !defined(__KERNEL__) && !defined(DIV_ROUND_UP) 46#if !defined(__KERNEL__)
47#if !defined(DIV_ROUND_UP)
47#define DIV_ROUND_UP(x,y) (((x) + ((y) - 1)) / (y)) 48#define DIV_ROUND_UP(x,y) (((x) + ((y) - 1)) / (y))
48#endif 49#endif
50#endif
49 51
50typedef struct if_set { 52typedef struct if_set {
51 if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)]; 53 if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];
diff --git a/include/linux/patchkey.h b/include/linux/patchkey.h
index d974a6e92372..aefda0ec6e62 100644
--- a/include/linux/patchkey.h
+++ b/include/linux/patchkey.h
@@ -32,7 +32,8 @@
32# else 32# else
33# error "could not determine byte order" 33# error "could not determine byte order"
34# endif 34# endif
35#elif defined(__BYTE_ORDER) 35#else
36#if defined(__BYTE_ORDER)
36# if __BYTE_ORDER == __BIG_ENDIAN 37# if __BYTE_ORDER == __BIG_ENDIAN
37# define _PATCHKEY(id) (0xfd00|id) 38# define _PATCHKEY(id) (0xfd00|id)
38# elif __BYTE_ORDER == __LITTLE_ENDIAN 39# elif __BYTE_ORDER == __LITTLE_ENDIAN
@@ -41,5 +42,6 @@
41# error "could not determine byte order" 42# error "could not determine byte order"
42# endif 43# endif
43#endif 44#endif
45#endif
44 46
45#endif /* _LINUX_PATCHKEY_H */ 47#endif /* _LINUX_PATCHKEY_H */
diff --git a/include/linux/pmu.h b/include/linux/pmu.h
index cafe98d96948..84e6a55a1202 100644
--- a/include/linux/pmu.h
+++ b/include/linux/pmu.h
@@ -6,6 +6,8 @@
6 * Copyright (C) 1998 Paul Mackerras. 6 * Copyright (C) 1998 Paul Mackerras.
7 */ 7 */
8 8
9#ifndef _LINUX_PMU_H
10#define _LINUX_PMU_H
9 11
10#define PMU_DRIVER_VERSION 2 12#define PMU_DRIVER_VERSION 2
11 13
@@ -207,3 +209,5 @@ extern int pmu_sys_suspended;
207#endif 209#endif
208 210
209#endif /* __KERNEL__ */ 211#endif /* __KERNEL__ */
212
213#endif /* _LINUX_PMU_H */
diff --git a/include/linux/sound.h b/include/linux/sound.h
index 44dcf0570432..fae20ba01fbf 100644
--- a/include/linux/sound.h
+++ b/include/linux/sound.h
@@ -1,3 +1,5 @@
1#ifndef _LINUX_SOUND_H
2#define _LINUX_SOUND_H
1 3
2/* 4/*
3 * Minor numbers for the sound driver. 5 * Minor numbers for the sound driver.
@@ -42,3 +44,5 @@ extern void unregister_sound_mixer(int unit);
42extern void unregister_sound_midi(int unit); 44extern void unregister_sound_midi(int unit);
43extern void unregister_sound_dsp(int unit); 45extern void unregister_sound_dsp(int unit);
44#endif /* __KERNEL__ */ 46#endif /* __KERNEL__ */
47
48#endif /* _LINUX_SOUND_H */
diff --git a/include/linux/soundcard.h b/include/linux/soundcard.h
index fe204fe39f7c..dfcf86f013a9 100644
--- a/include/linux/soundcard.h
+++ b/include/linux/soundcard.h
@@ -198,7 +198,8 @@ typedef struct seq_event_rec {
198# else 198# else
199# error "could not determine byte order" 199# error "could not determine byte order"
200# endif 200# endif
201#elif defined(__BYTE_ORDER) 201#else
202# if defined(__BYTE_ORDER)
202# if __BYTE_ORDER == __BIG_ENDIAN 203# if __BYTE_ORDER == __BIG_ENDIAN
203# define AFMT_S16_NE AFMT_S16_BE 204# define AFMT_S16_NE AFMT_S16_BE
204# elif __BYTE_ORDER == __LITTLE_ENDIAN 205# elif __BYTE_ORDER == __LITTLE_ENDIAN
@@ -206,6 +207,7 @@ typedef struct seq_event_rec {
206# else 207# else
207# error "could not determine byte order" 208# error "could not determine byte order"
208# endif 209# endif
210# endif
209#endif 211#endif
210 212
211/* 213/*
diff --git a/include/video/edid.h b/include/video/edid.h
index 928c342b33d6..c5f198704912 100644
--- a/include/video/edid.h
+++ b/include/video/edid.h
@@ -1,16 +1,14 @@
1#ifndef __linux_video_edid_h__ 1#ifndef __linux_video_edid_h__
2#define __linux_video_edid_h__ 2#define __linux_video_edid_h__
3 3
4#if !defined(__KERNEL__) || defined(CONFIG_X86)
5
6struct edid_info { 4struct edid_info {
7 unsigned char dummy[128]; 5 unsigned char dummy[128];
8}; 6};
9 7
10#ifdef __KERNEL__ 8#ifdef __KERNEL__
9#ifdef CONFIG_X86
11extern struct edid_info edid_info; 10extern struct edid_info edid_info;
12#endif /* __KERNEL__ */ 11#endif
13
14#endif 12#endif
15 13
16#endif /* __linux_video_edid_h__ */ 14#endif /* __linux_video_edid_h__ */
generated by cgit v1.2.2 (git 2.25.0) at 2025-06-03 04:50:49 -0400