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

Collapse All | Expand All

(-)file_not_specified_in_diff (-6 / +218 lines)
Line  Link Here
0
-- include/sound/core.h.orig   2008-12-16 23:31:29.000000000 +0100
0
++ include/sound/core.h   2008-12-17 00:04:50.000000000 +0100
Lines 29-34 Link Here
29
#include <linux/pm.h>			/* pm_message_t */
29
#include <linux/pm.h>			/* pm_message_t */
30
#include <linux/device.h>
30
#include <linux/device.h>
31
#include <linux/stringify.h>
31
#include <linux/stringify.h>
32
#include "typedefs.h"
32
/* number of supported soundcards */
33
/* number of supported soundcards */
33
#ifdef CONFIG_SND_DYNAMIC_MINORS
34
#ifdef CONFIG_SND_DYNAMIC_MINORS
Lines 380-391 Link Here
380
	printk(fmt ,##args)
381
	printk(fmt ,##args)
381
#endif
382
#endif
383
/**                                                                                                      
384
 * snd_assert - run-time assertion macro                                                                  
385
 * @expr: expression                                                                                      
386
 *                                                                                                        
387
 * This macro checks the expression in run-time and invokes the commands                                  
388
 * given in the rest arguments if the assertion is failed.                                                
389
 * When CONFIG_SND_DEBUG is not set, the expression is executed but                                      
390
 * not checked.                                                                                          
391
 */                                                                                                      
392
#define snd_assert(expr, args...) do {                                 \
393
       if (unlikely(!(expr))) {                                        \
394
               snd_printk(KERN_ERR "BUG? (%s)\n", __ASTRING__(expr));  \
395
               dump_stack();                                           \
396
               args;                                                   \
397
       }                                                               \
398
} while (0)                                                                                              
399
  
382
#define snd_BUG()		WARN(1, "BUG?\n")
400
#define snd_BUG()		WARN(1, "BUG?\n")
383
#define snd_BUG_ON(cond)	WARN((cond), "BUG? (%s)\n", __stringify(cond))
401
#define snd_BUG_ON(cond)	WARN((cond), "BUG? (%s)\n", __stringify(cond))
384
#else /* !CONFIG_SND_DEBUG */
402
#else /* !CONFIG_SND_DEBUG */
385
#define snd_printd(fmt, args...)	do { } while (0)
403
#define snd_printd(fmt, args...)	do { } while (0)
404
#define snd_assert(expr, args...)      (void)(expr)
386
#define snd_BUG()			do { } while (0)
405
#define snd_BUG()			do { } while (0)
387
static inline int __snd_bug_on(void)
406
static inline int __snd_bug_on(void)
388
{
407
{
389
-- include/sound/typedefs.h.orig   2008-12-17 00:15:10.000000000 +0100
408
++ include/sound/typedefs.h   2008-12-16 23:46:03.000000000 +0100
Line 0 Link Here
0
-- include/linux/pid.h.orig   2008-12-17 01:33:29.000000000 +0100
1
/*
2
 * Typedef's for backward compatibility (for out-of-kernel drivers)
3
 *
4
 * This file will be removed soon in future
5
 */
6
7
/* core stuff */
8
typedef struct snd_card snd_card_t;
9
typedef struct snd_device snd_device_t;
10
typedef struct snd_device_ops snd_device_ops_t;
11
typedef enum snd_card_type snd_card_type_t;
12
typedef struct snd_minor snd_minor_t;
13
14
/* info */
15
typedef struct snd_info_entry snd_info_entry_t;
16
typedef struct snd_info_buffer snd_info_buffer_t;
17
18
/* control */
19
typedef struct snd_ctl_file snd_ctl_file_t;
20
typedef struct snd_kcontrol snd_kcontrol_t;
21
typedef struct snd_kcontrol_new snd_kcontrol_new_t;
22
typedef struct snd_kcontrol_volatile snd_kcontrol_volatile_t;
23
typedef struct snd_kctl_event snd_kctl_event_t;
24
typedef struct snd_aes_iec958 snd_aes_iec958_t;
25
typedef struct snd_ctl_card_info snd_ctl_card_info_t;
26
typedef struct snd_ctl_elem_id snd_ctl_elem_id_t;
27
typedef struct snd_ctl_elem_list snd_ctl_elem_list_t;
28
typedef struct snd_ctl_elem_info snd_ctl_elem_info_t;
29
typedef struct snd_ctl_elem_value snd_ctl_elem_value_t;
30
typedef struct snd_ctl_event snd_ctl_event_t;
31
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
32
typedef struct snd_mixer_oss snd_mixer_oss_t;
33
#endif
34
35
/* timer */
36
typedef struct snd_timer snd_timer_t;
37
typedef struct snd_timer_instance snd_timer_instance_t;
38
typedef struct snd_timer_id snd_timer_id_t;
39
typedef struct snd_timer_ginfo snd_timer_ginfo_t;
40
typedef struct snd_timer_gparams snd_timer_gparams_t;
41
typedef struct snd_timer_gstatus snd_timer_gstatus_t;
42
typedef struct snd_timer_select snd_timer_select_t;
43
typedef struct snd_timer_info snd_timer_info_t;
44
typedef struct snd_timer_params snd_timer_params_t;
45
typedef struct snd_timer_status snd_timer_status_t;
46
typedef struct snd_timer_read snd_timer_read_t;
47
typedef struct snd_timer_tread snd_timer_tread_t;
48
49
/* PCM */
50
typedef struct snd_pcm snd_pcm_t;
51
typedef struct snd_pcm_str snd_pcm_str_t;
52
typedef struct snd_pcm_substream snd_pcm_substream_t;
53
typedef struct snd_pcm_info snd_pcm_info_t;
54
typedef struct snd_pcm_hw_params snd_pcm_hw_params_t;
55
typedef struct snd_pcm_sw_params snd_pcm_sw_params_t;
56
typedef struct snd_pcm_channel_info snd_pcm_channel_info_t;
57
typedef struct snd_pcm_status snd_pcm_status_t;
58
typedef struct snd_pcm_mmap_status snd_pcm_mmap_status_t;
59
typedef struct snd_pcm_mmap_control snd_pcm_mmap_control_t;
60
typedef struct snd_mask snd_mask_t;
61
typedef struct snd_sg_buf snd_pcm_sgbuf_t;
62
63
typedef struct snd_interval snd_interval_t;
64
typedef struct snd_xferi snd_xferi_t;
65
typedef struct snd_xfern snd_xfern_t;
66
typedef struct snd_xferv snd_xferv_t;
67
68
typedef struct snd_pcm_file snd_pcm_file_t;
69
typedef struct snd_pcm_runtime snd_pcm_runtime_t;
70
typedef struct snd_pcm_hardware snd_pcm_hardware_t;
71
typedef struct snd_pcm_ops snd_pcm_ops_t;
72
typedef struct snd_pcm_hw_rule snd_pcm_hw_rule_t;
73
typedef struct snd_pcm_hw_constraints snd_pcm_hw_constraints_t;
74
typedef struct snd_ratnum ratnum_t;
75
typedef struct snd_ratden ratden_t;
76
typedef struct snd_pcm_hw_constraint_ratnums snd_pcm_hw_constraint_ratnums_t;
77
typedef struct snd_pcm_hw_constraint_ratdens snd_pcm_hw_constraint_ratdens_t;
78
typedef struct snd_pcm_hw_constraint_list snd_pcm_hw_constraint_list_t;
79
typedef struct snd_pcm_group snd_pcm_group_t;
80
typedef struct snd_pcm_notify snd_pcm_notify_t;
81
82
/* rawmidi */
83
typedef struct snd_rawmidi snd_rawmidi_t;
84
typedef struct snd_rawmidi_info snd_rawmidi_info_t;
85
typedef struct snd_rawmidi_params snd_rawmidi_params_t;
86
typedef struct snd_rawmidi_status snd_rawmidi_status_t;
87
typedef struct snd_rawmidi_runtime snd_rawmidi_runtime_t;
88
typedef struct snd_rawmidi_substream snd_rawmidi_substream_t;
89
typedef struct snd_rawmidi_str snd_rawmidi_str_t;
90
typedef struct snd_rawmidi_ops snd_rawmidi_ops_t;
91
typedef struct snd_rawmidi_global_ops snd_rawmidi_global_ops_t;
92
typedef struct snd_rawmidi_file snd_rawmidi_file_t;
93
94
/* hwdep */
95
typedef struct snd_hwdep snd_hwdep_t;
96
typedef struct snd_hwdep_info snd_hwdep_info_t;
97
typedef struct snd_hwdep_dsp_status snd_hwdep_dsp_status_t;
98
typedef struct snd_hwdep_dsp_image snd_hwdep_dsp_image_t;
99
typedef struct snd_hwdep_ops snd_hwdep_ops_t;
100
101
/* sequencer */
102
typedef struct snd_seq_port_info snd_seq_port_info_t;
103
typedef struct snd_seq_port_subscribe snd_seq_port_subscribe_t;
104
typedef struct snd_seq_event snd_seq_event_t;
105
typedef struct snd_seq_addr snd_seq_addr_t;
106
typedef struct snd_seq_ev_volume snd_seq_ev_volume_t;
107
typedef struct snd_seq_ev_loop snd_seq_ev_loop_t;
108
typedef struct snd_seq_remove_events snd_seq_remove_events_t;
109
typedef struct snd_seq_query_subs snd_seq_query_subs_t;
110
typedef struct snd_seq_system_info snd_seq_system_info_t;
111
typedef struct snd_seq_client_info snd_seq_client_info_t;
112
typedef struct snd_seq_queue_info snd_seq_queue_info_t;
113
typedef struct snd_seq_queue_status snd_seq_queue_status_t;
114
typedef struct snd_seq_queue_tempo snd_seq_queue_tempo_t;
115
typedef struct snd_seq_queue_owner snd_seq_queue_owner_t;
116
typedef struct snd_seq_queue_timer snd_seq_queue_timer_t;
117
typedef struct snd_seq_queue_client snd_seq_queue_client_t;
118
typedef struct snd_seq_client_pool snd_seq_client_pool_t;
119
typedef struct snd_seq_instr snd_seq_instr_t;
120
typedef struct snd_seq_instr_data snd_seq_instr_data_t;
121
typedef struct snd_seq_instr_header snd_seq_instr_header_t;
122
123
typedef struct snd_seq_user_client user_client_t;
124
typedef struct snd_seq_kernel_client kernel_client_t;
125
typedef struct snd_seq_client client_t;
126
typedef struct snd_seq_queue queue_t;
127
128
/* seq_device */
129
typedef struct snd_seq_device snd_seq_device_t;
130
typedef struct snd_seq_dev_ops snd_seq_dev_ops_t;
131
132
/* seq_midi */
133
typedef struct snd_midi_event snd_midi_event_t;
134
135
/* seq_midi_emul */
136
typedef struct snd_midi_channel snd_midi_channel_t;
137
typedef struct snd_midi_channel_set snd_midi_channel_set_t;
138
typedef struct snd_midi_op snd_midi_op_t;
139
140
/* seq_oss */
141
typedef struct snd_seq_oss_arg snd_seq_oss_arg_t;
142
typedef struct snd_seq_oss_callback snd_seq_oss_callback_t;
143
typedef struct snd_seq_oss_reg snd_seq_oss_reg_t;
144
145
/* virmidi */
146
typedef struct snd_virmidi_dev snd_virmidi_dev_t;
147
typedef struct snd_virmidi snd_virmidi_t;
148
149
/* seq_instr */
150
typedef struct snd_seq_kcluster snd_seq_kcluster_t;
151
typedef struct snd_seq_kinstr_ops snd_seq_kinstr_ops_t;
152
typedef struct snd_seq_kinstr snd_seq_kinstr_t;
153
typedef struct snd_seq_kinstr_list snd_seq_kinstr_list_t;
154
155
/* ac97 */
156
typedef struct snd_ac97_bus ac97_bus_t;
157
typedef struct snd_ac97_bus_ops ac97_bus_ops_t;
158
typedef struct snd_ac97_template ac97_template_t;
159
typedef struct snd_ac97 ac97_t;
160
161
/* opl3/4 */
162
typedef struct snd_opl3 opl3_t;
163
typedef struct snd_opl4 opl4_t;
164
165
/* mpu401 */
166
typedef struct snd_mpu401 mpu401_t;
167
168
/* i2c */
169
typedef struct snd_i2c_device snd_i2c_device_t;
170
typedef struct snd_i2c_bus snd_i2c_bus_t;
171
172
typedef struct snd_ak4531 ak4531_t;
173
174
++ include/linux/pid.h   2008-12-17 01:40:10.000000000 +0100
Lines 111-116 Link Here
111
 */
111
 */
112
extern struct pid *find_pid_ns(int nr, struct pid_namespace *ns);
112
extern struct pid *find_pid_ns(int nr, struct pid_namespace *ns);
113
extern struct pid *find_vpid(int nr);
113
extern struct pid *find_vpid(int nr);
114
extern struct pid *find_pid(int nr);
114
/*
115
/*
115
 * Lookup a PID in the hash table, and return with it's count elevated.
116
 * Lookup a PID in the hash table, and return with it's count elevated.
116
-- kernel/pid.c.orig   2008-12-17 01:33:52.000000000 +0100
117
++ kernel/pid.c   2008-12-17 01:36:41.000000000 +0100
Lines 309-314 Link Here
309
}
309
}
310
EXPORT_SYMBOL_GPL(find_vpid);
310
EXPORT_SYMBOL_GPL(find_vpid);
311
struct pid *find_pid(int nr)
312
{
313
       return find_pid_ns(nr, &init_pid_ns);
314
}
315
EXPORT_SYMBOL_GPL(find_pid);
316
311
/*
317
/*
312
 * attach_pid() must be called with the tasklist_lock write-held.
318
 * attach_pid() must be called with the tasklist_lock write-held.
313
 */
319
 */
314
-- include/linux/sched.h.orig   2008-12-17 00:10:02.000000000 +0100
320
++ include/linux/sched.h   2008-12-17 00:10:57.000000000 +0100
Lines 1829-1834 Link Here
1829
extern void force_sig_specific(int, struct task_struct *);
1829
extern void force_sig_specific(int, struct task_struct *);
1830
extern int send_sig(int, struct task_struct *, int);
1830
extern int send_sig(int, struct task_struct *, int);
1831
extern void zap_other_threads(struct task_struct *p);
1831
extern void zap_other_threads(struct task_struct *p);
1832
extern int kill_proc(pid_t, int, int);
1832
extern struct sigqueue *sigqueue_alloc(void);
1833
extern struct sigqueue *sigqueue_alloc(void);
1833
extern void sigqueue_free(struct sigqueue *);
1834
extern void sigqueue_free(struct sigqueue *);
1834
extern int send_sigqueue(struct sigqueue *,  struct task_struct *, int group);
1835
extern int send_sigqueue(struct sigqueue *,  struct task_struct *, int group);
1835
-- kernel/signal.c.orig   2008-12-17 01:43:48.000000000 +0100
1836
++ kernel/signal.c   2008-12-17 01:29:40.000000000 +0100
Lines 1237-1242 Link Here
1237
}
1237
}
1238
EXPORT_SYMBOL(kill_pid);
1238
EXPORT_SYMBOL(kill_pid);
1239
int
1240
kill_proc(pid_t pid, int sig, int priv)
1241
{
1242
       int ret;
1243
1244
       rcu_read_lock();
1245
       ret = kill_pid_info(sig, __si_special(priv), find_pid(pid));
1246
       rcu_read_unlock();
1247
       return ret;
1248
}
1249
1239
/*
1250
/*
1240
 * These functions support sending signals using preallocated sigqueue
1251
 * These functions support sending signals using preallocated sigqueue
1241
 * structures.  This is needed "because realtime applications cannot
1252
 * structures.  This is needed "because realtime applications cannot
Lines 1929-1934 Link Here
1929
EXPORT_SYMBOL_GPL(dequeue_signal);
1940
EXPORT_SYMBOL_GPL(dequeue_signal);
1930
EXPORT_SYMBOL(flush_signals);
1941
EXPORT_SYMBOL(flush_signals);
1931
EXPORT_SYMBOL(force_sig);
1942
EXPORT_SYMBOL(force_sig);
1943
EXPORT_SYMBOL(kill_proc);
1932
EXPORT_SYMBOL(send_sig);
1944
EXPORT_SYMBOL(send_sig);
1933
EXPORT_SYMBOL(send_sig_info);
1945
EXPORT_SYMBOL(send_sig_info);
1934
EXPORT_SYMBOL(sigprocmask);
1946
EXPORT_SYMBOL(sigprocmask);

Return to bug 91558