Skip to content

Commit 0b381a2

Browse files
torvaldstorvalds
committed
Merge tag 'disintegrate-main-20121013' of git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI disintegration for include/linux/{,byteorder/}*.h from David Howells: "The patches contained herein do the following: (1) Remove kernel-only stuff in linux/ppp-comp.h from the UAPI. I checked this with Paul Mackerras before I created the patch and he suggested some extra bits to unexport. (2) Remove linux/blk_types.h entirely from the UAPI as none of it is userspace applicable, and remove from the UAPI that part of linux/fs.h that was the reason for linux/blk_types.h being exported in the first place. I discussed this with Jens Axboe before creating the patch. (3) The big patch of the series to disintegrate include/linux/*.h as a unit. This could be split up, though there would be collisions in moving stuff between the two Kbuild files when the parts are merged as that file is sorted alphabetically rather than being grouped by subsystem. Of this set of headers, 17 files have changed in the UAPI exported region since the 4th and only 8 since the 9th so there isn't much change in this area - as one might expect. It should be pretty obvious and straightforward if it does come to fixing up: stuff in __KERNEL__ guards stays where it is and stuff outside moves to the same file in the include/uapi/linux/ directory. If a new file appears then things get a bit more complicated as the "headers +=" line has to move to include/uapi/linux/Kbuild. Only one new file has appeared since the 9th and I judge this type of event relatively unlikely. (4) A patch to disintegrate include/linux/byteorder/*.h as a unit. Signed-off-by: David Howells <dhowells@redhat.com>" * tag 'disintegrate-main-20121013' of git://git.infradead.org/users/dhowells/linux-headers: UAPI: (Scripted) Disintegrate include/linux/byteorder UAPI: (Scripted) Disintegrate include/linux UAPI: Unexport linux/blk_types.h UAPI: Unexport part of linux/ppp-comp.h
2 parents 034b5ee + 5921e6f commit 0b381a2

File tree

584 files changed

+32928
-30367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

584 files changed

+32928
-30367
lines changed

‎include/linux/Kbuild

Lines changed: 0 additions & 380 deletions
Original file line numberDiff line numberDiff line change
@@ -22,390 +22,10 @@ header-y += wimax/
2222

2323
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
2424
$(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)
25-
header-y += a.out.h
2625
endif
2726
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
2827
$(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h),)
29-
header-y += kvm.h
3028
endif
3129
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
3230
$(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h),)
33-
header-y += kvm_para.h
3431
endif
35-
36-
header-y += acct.h
37-
header-y += adb.h
38-
header-y += adfs_fs.h
39-
header-y += affs_hardblocks.h
40-
header-y += agpgart.h
41-
header-y += aio_abi.h
42-
header-y += apm_bios.h
43-
header-y += arcfb.h
44-
header-y += atalk.h
45-
header-y += atm.h
46-
header-y += atm_eni.h
47-
header-y += atm_he.h
48-
header-y += atm_idt77105.h
49-
header-y += atm_nicstar.h
50-
header-y += atm_tcp.h
51-
header-y += atm_zatm.h
52-
header-y += atmapi.h
53-
header-y += atmarp.h
54-
header-y += atmbr2684.h
55-
header-y += atmclip.h
56-
header-y += atmdev.h
57-
header-y += atmioc.h
58-
header-y += atmlec.h
59-
header-y += atmmpc.h
60-
header-y += atmppp.h
61-
header-y += atmsap.h
62-
header-y += atmsvc.h
63-
header-y += audit.h
64-
header-y += auto_fs.h
65-
header-y += auto_fs4.h
66-
header-y += auxvec.h
67-
header-y += ax25.h
68-
header-y += b1lli.h
69-
header-y += baycom.h
70-
header-y += bfs_fs.h
71-
header-y += binfmts.h
72-
header-y += blk_types.h
73-
header-y += blkpg.h
74-
header-y += blktrace_api.h
75-
header-y += bpqether.h
76-
header-y += bsg.h
77-
header-y += can.h
78-
header-y += capability.h
79-
header-y += capi.h
80-
header-y += cciss_defs.h
81-
header-y += cciss_ioctl.h
82-
header-y += cdrom.h
83-
header-y += cgroupstats.h
84-
header-y += chio.h
85-
header-y += cm4000_cs.h
86-
header-y += cn_proc.h
87-
header-y += coda.h
88-
header-y += coda_psdev.h
89-
header-y += coff.h
90-
header-y += connector.h
91-
header-y += const.h
92-
header-y += cramfs_fs.h
93-
header-y += cuda.h
94-
header-y += cyclades.h
95-
header-y += cycx_cfm.h
96-
header-y += dcbnl.h
97-
header-y += dccp.h
98-
header-y += dlm.h
99-
header-y += dlm_device.h
100-
header-y += dlm_netlink.h
101-
header-y += dlm_plock.h
102-
header-y += dlmconstants.h
103-
header-y += dm-ioctl.h
104-
header-y += dm-log-userspace.h
105-
header-y += dn.h
106-
header-y += dqblk_xfs.h
107-
header-y += edd.h
108-
header-y += efs_fs_sb.h
109-
header-y += elf-em.h
110-
header-y += elf-fdpic.h
111-
header-y += elf.h
112-
header-y += elfcore.h
113-
header-y += errno.h
114-
header-y += errqueue.h
115-
header-y += ethtool.h
116-
header-y += eventpoll.h
117-
header-y += fadvise.h
118-
header-y += falloc.h
119-
header-y += fanotify.h
120-
header-y += fb.h
121-
header-y += fcntl.h
122-
header-y += fd.h
123-
header-y += fdreg.h
124-
header-y += fib_rules.h
125-
header-y += fiemap.h
126-
header-y += filter.h
127-
header-y += firewire-cdev.h
128-
header-y += firewire-constants.h
129-
header-y += flat.h
130-
header-y += fs.h
131-
header-y += fsl_hypervisor.h
132-
header-y += fuse.h
133-
header-y += futex.h
134-
header-y += gameport.h
135-
header-y += gen_stats.h
136-
header-y += genetlink.h
137-
header-y += gfs2_ondisk.h
138-
header-y += gigaset_dev.h
139-
header-y += hdlc.h
140-
header-y += hdlcdrv.h
141-
header-y += hdreg.h
142-
header-y += hid.h
143-
header-y += hiddev.h
144-
header-y += hidraw.h
145-
header-y += hpet.h
146-
header-y += hysdn_if.h
147-
header-y += i2c-dev.h
148-
header-y += i2c.h
149-
header-y += i2o-dev.h
150-
header-y += i8k.h
151-
header-y += icmp.h
152-
header-y += icmpv6.h
153-
header-y += if.h
154-
header-y += if_addr.h
155-
header-y += if_addrlabel.h
156-
header-y += if_alg.h
157-
header-y += if_arcnet.h
158-
header-y += if_arp.h
159-
header-y += if_bonding.h
160-
header-y += if_bridge.h
161-
header-y += if_cablemodem.h
162-
header-y += if_eql.h
163-
header-y += if_ether.h
164-
header-y += if_fc.h
165-
header-y += if_fddi.h
166-
header-y += if_frad.h
167-
header-y += if_hippi.h
168-
header-y += if_infiniband.h
169-
header-y += if_link.h
170-
header-y += if_ltalk.h
171-
header-y += if_packet.h
172-
header-y += if_phonet.h
173-
header-y += if_plip.h
174-
header-y += if_ppp.h
175-
header-y += if_pppol2tp.h
176-
header-y += if_pppox.h
177-
header-y += if_slip.h
178-
header-y += if_team.h
179-
header-y += if_tun.h
180-
header-y += if_tunnel.h
181-
header-y += if_vlan.h
182-
header-y += if_x25.h
183-
header-y += igmp.h
184-
header-y += in.h
185-
header-y += in6.h
186-
header-y += in_route.h
187-
header-y += sock_diag.h
188-
header-y += inet_diag.h
189-
header-y += unix_diag.h
190-
header-y += packet_diag.h
191-
header-y += inotify.h
192-
header-y += input.h
193-
header-y += ioctl.h
194-
header-y += ip.h
195-
header-y += ip6_tunnel.h
196-
header-y += ip_vs.h
197-
header-y += ipc.h
198-
header-y += ipmi.h
199-
header-y += ipmi_msgdefs.h
200-
header-y += ipsec.h
201-
header-y += ipv6.h
202-
header-y += ipv6_route.h
203-
header-y += ipx.h
204-
header-y += irda.h
205-
header-y += irqnr.h
206-
header-y += isdn.h
207-
header-y += isdn_divertif.h
208-
header-y += isdn_ppp.h
209-
header-y += isdnif.h
210-
header-y += iso_fs.h
211-
header-y += ivtv.h
212-
header-y += ivtvfb.h
213-
header-y += ixjuser.h
214-
header-y += jffs2.h
215-
header-y += joystick.h
216-
header-y += kd.h
217-
header-y += kdev_t.h
218-
header-y += kernel.h
219-
header-y += kernelcapi.h
220-
header-y += kernel-page-flags.h
221-
header-y += kexec.h
222-
header-y += keyboard.h
223-
header-y += keyctl.h
224-
header-y += l2tp.h
225-
header-y += limits.h
226-
header-y += llc.h
227-
header-y += loop.h
228-
header-y += lp.h
229-
header-y += magic.h
230-
header-y += major.h
231-
header-y += map_to_7segment.h
232-
header-y += matroxfb.h
233-
header-y += mdio.h
234-
header-y += media.h
235-
header-y += mei.h
236-
header-y += mempolicy.h
237-
header-y += meye.h
238-
header-y += mii.h
239-
header-y += minix_fs.h
240-
header-y += mman.h
241-
header-y += mmtimer.h
242-
header-y += mqueue.h
243-
header-y += mroute.h
244-
header-y += mroute6.h
245-
header-y += msdos_fs.h
246-
header-y += msg.h
247-
header-y += mtio.h
248-
header-y += n_r3964.h
249-
header-y += nbd.h
250-
header-y += ncp.h
251-
header-y += ncp_fs.h
252-
header-y += ncp_mount.h
253-
header-y += ncp_no.h
254-
header-y += neighbour.h
255-
header-y += net.h
256-
header-y += net_dropmon.h
257-
header-y += net_tstamp.h
258-
header-y += netdevice.h
259-
header-y += netfilter.h
260-
header-y += netfilter_arp.h
261-
header-y += netfilter_bridge.h
262-
header-y += netfilter_decnet.h
263-
header-y += netfilter_ipv4.h
264-
header-y += netfilter_ipv6.h
265-
header-y += netlink.h
266-
header-y += netrom.h
267-
header-y += nfc.h
268-
header-y += nfs.h
269-
header-y += nfs2.h
270-
header-y += nfs3.h
271-
header-y += nfs4.h
272-
header-y += nfs4_mount.h
273-
header-y += nfs_fs.h
274-
header-y += nfs_idmap.h
275-
header-y += nfs_mount.h
276-
header-y += nfsacl.h
277-
header-y += nl80211.h
278-
header-y += nubus.h
279-
header-y += nvram.h
280-
header-y += omap3isp.h
281-
header-y += omapfb.h
282-
header-y += oom.h
283-
header-y += param.h
284-
header-y += parport.h
285-
header-y += patchkey.h
286-
header-y += pci.h
287-
header-y += pci_regs.h
288-
header-y += perf_event.h
289-
header-y += personality.h
290-
header-y += pfkeyv2.h
291-
header-y += pg.h
292-
header-y += phantom.h
293-
header-y += phonet.h
294-
header-y += pkt_cls.h
295-
header-y += pkt_sched.h
296-
header-y += pktcdvd.h
297-
header-y += pmu.h
298-
header-y += poll.h
299-
header-y += posix_types.h
300-
header-y += ppdev.h
301-
header-y += ppp-comp.h
302-
header-y += ppp-ioctl.h
303-
header-y += ppp_defs.h
304-
header-y += pps.h
305-
header-y += prctl.h
306-
header-y += ptp_clock.h
307-
header-y += ptrace.h
308-
header-y += qnx4_fs.h
309-
header-y += qnxtypes.h
310-
header-y += quota.h
311-
header-y += radeonfb.h
312-
header-y += random.h
313-
header-y += raw.h
314-
header-y += rds.h
315-
header-y += reboot.h
316-
header-y += reiserfs_fs.h
317-
header-y += reiserfs_xattr.h
318-
header-y += resource.h
319-
header-y += rfkill.h
320-
header-y += romfs_fs.h
321-
header-y += rose.h
322-
header-y += route.h
323-
header-y += rtc.h
324-
header-y += rtnetlink.h
325-
header-y += scc.h
326-
header-y += sched.h
327-
header-y += screen_info.h
328-
header-y += sdla.h
329-
header-y += seccomp.h
330-
header-y += securebits.h
331-
header-y += selinux_netlink.h
332-
header-y += sem.h
333-
header-y += serial.h
334-
header-y += serial_core.h
335-
header-y += serial_reg.h
336-
header-y += serio.h
337-
header-y += shm.h
338-
header-y += signal.h
339-
header-y += signalfd.h
340-
header-y += snmp.h
341-
header-y += socket.h
342-
header-y += sockios.h
343-
header-y += som.h
344-
header-y += sonet.h
345-
header-y += sonypi.h
346-
header-y += sound.h
347-
header-y += soundcard.h
348-
header-y += stat.h
349-
header-y += stddef.h
350-
header-y += string.h
351-
header-y += suspend_ioctls.h
352-
header-y += swab.h
353-
header-y += synclink.h
354-
header-y += sysctl.h
355-
header-y += sysinfo.h
356-
header-y += taskstats.h
357-
header-y += tcp.h
358-
header-y += tcp_metrics.h
359-
header-y += telephony.h
360-
header-y += termios.h
361-
header-y += time.h
362-
header-y += times.h
363-
header-y += timex.h
364-
header-y += tiocl.h
365-
header-y += tipc.h
366-
header-y += tipc_config.h
367-
header-y += toshiba.h
368-
header-y += tty.h
369-
header-y += tty_flags.h
370-
header-y += types.h
371-
header-y += udf_fs_i.h
372-
header-y += udp.h
373-
header-y += uhid.h
374-
header-y += uinput.h
375-
header-y += uio.h
376-
header-y += ultrasound.h
377-
header-y += un.h
378-
header-y += unistd.h
379-
header-y += usbdevice_fs.h
380-
header-y += utime.h
381-
header-y += utsname.h
382-
header-y += uuid.h
383-
header-y += uvcvideo.h
384-
header-y += v4l2-common.h
385-
header-y += v4l2-controls.h
386-
header-y += v4l2-dv-timings.h
387-
header-y += v4l2-mediabus.h
388-
header-y += v4l2-subdev.h
389-
header-y += veth.h
390-
header-y += vfio.h
391-
header-y += vhost.h
392-
header-y += videodev2.h
393-
header-y += virtio_9p.h
394-
header-y += virtio_balloon.h
395-
header-y += virtio_blk.h
396-
header-y += virtio_config.h
397-
header-y += virtio_console.h
398-
header-y += virtio_ids.h
399-
header-y += virtio_net.h
400-
header-y += virtio_pci.h
401-
header-y += virtio_ring.h
402-
header-y += virtio_rng.h
403-
header-y += vt.h
404-
header-y += wait.h
405-
header-y += wanrouter.h
406-
header-y += watchdog.h
407-
header-y += wimax.h
408-
header-y += wireless.h
409-
header-y += x25.h
410-
header-y += xattr.h
411-
header-y += xfrm.h

0 commit comments

Comments
 (0)